From 127d925b298645aa9392df5fbd20260926a52e78 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Wed, 15 Aug 2012 23:31:45 +0400 Subject: [PATCH] --- yaml --- r: 323469 b: refs/heads/master c: bcb4a75bde3821cecb17a71d287abfd6ef9bd68d h: refs/heads/master i: 323467: 97cbad955f6e098515ae87a55a947f8266372095 v: v3 --- [refs] | 2 +- trunk/drivers/hid/hidraw.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1212b724c7cc..1e73a2254b67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2843b673d03421e0e73cf061820d1db328f7c8eb +refs/heads/master: bcb4a75bde3821cecb17a71d287abfd6ef9bd68d diff --git a/trunk/drivers/hid/hidraw.c b/trunk/drivers/hid/hidraw.c index 3b6f7bf5a77e..7c47fc3f7b2b 100644 --- a/trunk/drivers/hid/hidraw.c +++ b/trunk/drivers/hid/hidraw.c @@ -559,21 +559,28 @@ int __init hidraw_init(void) if (result < 0) { pr_warn("can't get major number\n"); - result = 0; goto out; } hidraw_class = class_create(THIS_MODULE, "hidraw"); if (IS_ERR(hidraw_class)) { result = PTR_ERR(hidraw_class); - unregister_chrdev(hidraw_major, "hidraw"); - goto out; + goto error_cdev; } cdev_init(&hidraw_cdev, &hidraw_ops); - cdev_add(&hidraw_cdev, dev_id, HIDRAW_MAX_DEVICES); + result = cdev_add(&hidraw_cdev, dev_id, HIDRAW_MAX_DEVICES); + if (result < 0) + goto error_class; + out: return result; + +error_class: + class_destroy(hidraw_class); +error_cdev: + unregister_chrdev_region(dev_id, HIDRAW_MAX_DEVICES); + goto out; } void hidraw_exit(void)