| From 6edf3c30af01854c416f8654d3d5d2652470afd4 Mon Sep 17 00:00:00 2001 |
| From: Vivien Didelot <vivien.didelot@savoirfairelinux.com> |
| Date: Thu, 26 Jan 2012 15:59:00 -0500 |
| Subject: hwmon: (sht15) fix bad error code |
| |
| From: Vivien Didelot <vivien.didelot@savoirfairelinux.com> |
| |
| 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> |
| |
| --- |
| drivers/hwmon/sht15.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/hwmon/sht15.c |
| +++ b/drivers/hwmon/sht15.c |
| @@ -515,7 +515,7 @@ static int sht15_invalidate_voltage(stru |
| |
| static int __devinit sht15_probe(struct platform_device *pdev) |
| { |
| - int ret = 0; |
| + int ret; |
| struct sht15_data *data = kzalloc(sizeof(*data), GFP_KERNEL); |
| |
| if (!data) { |
| @@ -532,6 +532,7 @@ static int __devinit sht15_probe(struct |
| init_waitqueue_head(&data->wait_queue); |
| |
| if (pdev->dev.platform_data == NULL) { |
| + ret = -EINVAL; |
| dev_err(&pdev->dev, "no platform data supplied"); |
| goto err_free_data; |
| } |
