diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 21:32:01 -0400 |
| commit | 5615ca7906aefbdc3318604c89db5931d0a25910 (patch) | |
| tree | c34bcc7e314f49005ad88ac84c908128729c0329 /drivers/hwmon/hwmon.c | |
| parent | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (diff) | |
| parent | 9dfb7808fb05643b0d06df7411b94d9546696bf1 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/hwmon/hwmon.c')
| -rw-r--r-- | drivers/hwmon/hwmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |