Messages in this thread Patch in this message | | | From | Sudip Mukherjee <> | Subject | [PATCH] usb: gadget: fix error handling | Date | Thu, 7 Jan 2016 18:30:37 +0530 |
| |
We are doing PTR_ERR() of NULL, and that will actually make ret = 0. So incase of both error and success we are actually returning the success code.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> --- drivers/usb/gadget/composite.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 8b14c2a..17ce6b5 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -2017,14 +2017,14 @@ int composite_os_desc_req_prepare(struct usb_composite_dev *cdev, cdev->os_desc_req = usb_ep_alloc_request(ep0, GFP_KERNEL); if (!cdev->os_desc_req) { - ret = PTR_ERR(cdev->os_desc_req); + ret = -ENOMEM; goto end; } /* OS feature descriptor length <= 4kB */ cdev->os_desc_req->buf = kmalloc(4096, GFP_KERNEL); if (!cdev->os_desc_req->buf) { - ret = PTR_ERR(cdev->os_desc_req->buf); + ret = -ENOMEM; kfree(cdev->os_desc_req); goto end; } -- 1.9.1
| |