aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2010-04-06 17:34:55 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-07 11:38:03 -0400
commit6e191f7bb083544dc4fa3879ff81caf97c65d197 (patch)
tree5a2b8aa23949b4216e571641e66950495bc74c21 /drivers/char
parent70655c06bd3f25111312d63985888112aed15ac5 (diff)
devmem: handle class_create() failure
I hit this when we had a bug in IDR for a few days. Basically sysfs would fail to create new inodes since it uses an IDR and therefore class_create would fail. While we are unlikely to see this fail we may as well handle it instead of oopsing. Signed-off-by: Anton Blanchard <anton@samba.org> Reviewed-by: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/mem.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 1f3215ac085b..47c8452f485f 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -908,6 +908,9 @@ static int __init chr_dev_init(void)
908 printk("unable to get major %d for memory devs\n", MEM_MAJOR); 908 printk("unable to get major %d for memory devs\n", MEM_MAJOR);
909 909
910 mem_class = class_create(THIS_MODULE, "mem"); 910 mem_class = class_create(THIS_MODULE, "mem");
911 if (IS_ERR(mem_class))
912 return PTR_ERR(mem_class);
913
911 mem_class->devnode = mem_devnode; 914 mem_class->devnode = mem_devnode;
912 for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) { 915 for (minor = 1; minor < ARRAY_SIZE(devlist); minor++) {
913 if (!devlist[minor].name) 916 if (!devlist[minor].name)