diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2012-01-26 15:59:00 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-03 09:19:02 -0800 |
| commit | 0b4e97269313969faf20f4c341af10d734d6d00d (patch) | |
| tree | 2efdb94aed9231a47ef99a253a32093777cb2b36 /drivers/hwmon/sht15.c | |
| parent | 70c3e9e41475dd3d7dbd816130ff8c21e6e1f745 (diff) | |
| download | lwn-0b4e97269313969faf20f4c341af10d734d6d00d.tar.gz lwn-0b4e97269313969faf20f4c341af10d734d6d00d.zip | |
hwmon: (sht15) fix bad error code
commit 6edf3c30af01854c416f8654d3d5d2652470afd4 upstream.
When no platform data was supplied, returned error code was 0.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon/sht15.c')
| -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 cf4330b352ef..9594cdb1cd0f 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; } |