diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2012-01-26 21:59:00 +0100 |
|---|---|---|
| committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2012-01-29 19:35:21 +0100 |
| commit | 6edf3c30af01854c416f8654d3d5d2652470afd4 (patch) | |
| tree | 744b870d3be8cd6bb97c200385b08748422862cb /drivers | |
| parent | MAINTAINERS: Drop maintainer for MAX1668 hwmon driver (diff) | |
| download | linux-6edf3c30af01854c416f8654d3d5d2652470afd4.tar.xz linux-6edf3c30af01854c416f8654d3d5d2652470afd4.zip | |
hwmon: (sht15) fix bad error code
When no platform data was supplied, returned error code was 0.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Cc: stable@vger.kernel.org # 2.6.32+
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/sht15.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index 6ddeae049058..91fdd1fe18b0 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c @@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb, static int __devinit sht15_probe(struct platform_device *pdev) { - int ret = 0; + int ret; struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL); u8 status = 0; @@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev) init_waitqueue_head(&data->wait_queue); if (pdev->dev.platform_data == NULL) { + ret = -EINVAL; dev_err(&pdev->dev, "no platform data supplied\n"); goto err_free_data; } |