Commit 6edf3c30 authored by Vivien Didelot's avatar Vivien Didelot Committed by Guenter Roeck

hwmon: (sht15) fix bad error code

When no platform data was supplied, returned error code was 0.
Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Cc: stable@vger.kernel.org # 2.6.32+
Signed-off-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
parent cba9384b
...@@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb, ...@@ -883,7 +883,7 @@ static int sht15_invalidate_voltage(struct notifier_block *nb,
static int __devinit sht15_probe(struct platform_device *pdev) static int __devinit sht15_probe(struct platform_device *pdev)
{ {
int ret = 0; int ret;
struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL); struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL);
u8 status = 0; u8 status = 0;
...@@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev) ...@@ -901,6 +901,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
init_waitqueue_head(&data->wait_queue); init_waitqueue_head(&data->wait_queue);
if (pdev->dev.platform_data == NULL) { if (pdev->dev.platform_data == NULL) {
ret = -EINVAL;
dev_err(&pdev->dev, "no platform data supplied\n"); dev_err(&pdev->dev, "no platform data supplied\n");
goto err_free_data; goto err_free_data;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment