diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 08:47:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 08:47:12 -0700 |
| commit | fa515888821d307a79cb8d1e8e052b7aff39d844 (patch) | |
| tree | 5d04ecc5289184c4cc5ab990e4132bac51385fcc | |
| parent | bc9be57f85d465506d0d4a8951275dae4e694f16 (diff) | |
| parent | c30aa39c233ca1df8397eb9e9c8b40a397ce72bb (diff) | |
| download | lwn-fa515888821d307a79cb8d1e8e052b7aff39d844.tar.gz lwn-fa515888821d307a79cb8d1e8e052b7aff39d844.zip | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails
| -rw-r--r-- | drivers/hwmon/twl4030-madc-hwmon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c index de5819199e2e..57240740b161 100644 --- a/drivers/hwmon/twl4030-madc-hwmon.c +++ b/drivers/hwmon/twl4030-madc-hwmon.c @@ -98,7 +98,6 @@ static const struct attribute_group twl4030_madc_group = { static int __devinit twl4030_madc_hwmon_probe(struct platform_device *pdev) { int ret; - int status; struct device *hwmon; ret = sysfs_create_group(&pdev->dev.kobj, &twl4030_madc_group); @@ -107,7 +106,7 @@ static int __devinit twl4030_madc_hwmon_probe(struct platform_device *pdev) hwmon = hwmon_device_register(&pdev->dev); if (IS_ERR(hwmon)) { dev_err(&pdev->dev, "hwmon_device_register failed.\n"); - status = PTR_ERR(hwmon); + ret = PTR_ERR(hwmon); goto err_reg; } |