git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HID: hid-cypress: validate length of report
[pandora-kernel.git]
/
drivers
/
hwmon
/
sht15.c
diff --git
a/drivers/hwmon/sht15.c
b/drivers/hwmon/sht15.c
index
fe4104c
..
3e3153e
100644
(file)
--- 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)
{
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;
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) {
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;
}
dev_err(&pdev->dev, "no platform data supplied\n");
goto err_free_data;
}
@@
-925,7
+926,13
@@
static int __devinit sht15_probe(struct platform_device *pdev)
if (voltage)
data->supply_uV = voltage;
if (voltage)
data->supply_uV = voltage;
- regulator_enable(data->reg);
+ ret = regulator_enable(data->reg);
+ if (ret != 0) {
+ dev_err(&pdev->dev,
+ "failed to enable regulator: %d\n", ret);
+ goto err_free_data;
+ }
+
/*
* Setup a notifier block to update this if another device
* causes the voltage to change
/*
* Setup a notifier block to update this if another device
* causes the voltage to change