diff options
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/hdaps.c | 6 | ||||
-rw-r--r-- | drivers/hwmon/hwmon.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c index 7f0107613827..0015da5668a1 100644 --- a/drivers/hwmon/hdaps.c +++ b/drivers/hwmon/hdaps.c | |||
@@ -296,11 +296,9 @@ static int hdaps_probe(struct device *dev) | |||
296 | return 0; | 296 | return 0; |
297 | } | 297 | } |
298 | 298 | ||
299 | static int hdaps_resume(struct device *dev, u32 level) | 299 | static int hdaps_resume(struct device *dev) |
300 | { | 300 | { |
301 | if (level == RESUME_ENABLE) | 301 | return hdaps_device_init(); |
302 | return hdaps_device_init(); | ||
303 | return 0; | ||
304 | } | 302 | } |
305 | 303 | ||
306 | static struct device_driver hdaps_driver = { | 304 | static struct device_driver hdaps_driver = { |
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 9b41c9bd805f..6f48579799b5 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c | |||
@@ -45,7 +45,7 @@ struct class_device *hwmon_device_register(struct device *dev) | |||
45 | return ERR_PTR(-ENOMEM); | 45 | return ERR_PTR(-ENOMEM); |
46 | 46 | ||
47 | id = id & MAX_ID_MASK; | 47 | id = id & MAX_ID_MASK; |
48 | cdev = class_device_create(hwmon_class, MKDEV(0,0), dev, | 48 | cdev = class_device_create(hwmon_class, NULL, MKDEV(0,0), dev, |
49 | HWMON_ID_FORMAT, id); | 49 | HWMON_ID_FORMAT, id); |
50 | 50 | ||
51 | if (IS_ERR(cdev)) | 51 | if (IS_ERR(cdev)) |