From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch 2/2] usbhid: fix some error codes in hiddev_connect() Date: Thu, 26 May 2011 11:50:18 +0300 Message-ID: <20110526085018.GE14591@shale.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Jiri Kosina Cc: "open list:USB HID/HIDBP DRI..." , "open list:HID CORE LAYER" , kernel-janitors-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-input@vger.kernel.org Returning -1 is -EPERM which is inappropriate here. Signed-off-by: Dan Carpenter diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index b2f9a3a..80b8e76 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -890,8 +890,9 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) return -1; } - if (!(hiddev = kzalloc(sizeof(struct hiddev), GFP_KERNEL))) - return -1; + hiddev = kzalloc(sizeof(struct hiddev), GFP_KERNEL); + if (!hiddev) + return -ENOMEM; init_waitqueue_head(&hiddev->wait); INIT_LIST_HEAD(&hiddev->list); @@ -905,7 +906,7 @@ int hiddev_connect(struct hid_device *hid, unsigned int force) hid_err(hid, "Not able to get a minor for this device\n"); hid->hiddev = NULL; kfree(hiddev); - return -1; + return retval; } return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html