diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 16:09:47 -0400 |
| commit | 84860bf0644d7c45afe7ddbd30731c3e3c371fae (patch) | |
| tree | d6c4b98a9c3fd9981e7fcc5d7729c9e01e327767 /drivers/char/misc.c | |
| parent | 8caf89157d64f1eedba37113afb4b303b2b3e301 (diff) | |
| parent | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-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); |