diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:50:09 -0400 |
| commit | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (patch) | |
| tree | aa1a9cc1e79ae66f6cbb0fe39d79a80ca76331e8 /drivers/hwmon/hdaps.c | |
| parent | c45154a3b1fecdbb51b5462c9f730b44e62b83a5 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/hwmon/hdaps.c')
| -rw-r--r-- | drivers/hwmon/hdaps.c | 6 |
1 files changed, 2 insertions, 4 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 = { |