diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2005-10-28 18:50:51 -0400 |
| commit | a4da0628efd788eb199dd9df225e296035ec2539 (patch) | |
| tree | 1e611030c993e1480dc2f07f26976d2d33002b0d /drivers/char/misc.c | |
| parent | 70a30e16a8a9d22396a4d1e96af86e43594df584 (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/misc.c')
| -rw-r--r-- | drivers/char/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 0c8375165e29..3e4c0414a01a 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
| @@ -234,7 +234,7 @@ int misc_register(struct miscdevice * misc) | |||
| 234 | } | 234 | } |
| 235 | dev = MKDEV(MISC_MAJOR, misc->minor); | 235 | dev = MKDEV(MISC_MAJOR, misc->minor); |
| 236 | 236 | ||
| 237 | misc->class = class_device_create(misc_class, dev, misc->dev, | 237 | misc->class = class_device_create(misc_class, NULL, dev, misc->dev, |
| 238 | "%s", misc->name); | 238 | "%s", misc->name); |
| 239 | if (IS_ERR(misc->class)) { | 239 | if (IS_ERR(misc->class)) { |
| 240 | err = PTR_ERR(misc->class); | 240 | err = PTR_ERR(misc->class); |