From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752008AbcAIGrX (ORCPT ); Sat, 9 Jan 2016 01:47:23 -0500 Received: from mail-pa0-f66.google.com ([209.85.220.66]:34806 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750986AbcAIGrV (ORCPT ); Sat, 9 Jan 2016 01:47:21 -0500 From: Sudip Mukherjee To: Felipe Balbi , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Peter Cen , Sudip Mukherjee Subject: [PATCH v2] usb: gadget: fix error handling Date: Sat, 9 Jan 2016 12:17:11 +0530 Message-Id: <1452322031-19086-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We are doing PTR_ERR() of NULL, and that will actually make ret = 0. So in case of both error and success we are actually returning the success code. Reviewed-by: Peter Cen Signed-off-by: Sudip Mukherjee --- v2: spelling of incase in commit message 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