From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751201AbcAHGDe (ORCPT ); Fri, 8 Jan 2016 01:03:34 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:33062 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750766AbcAHGDc (ORCPT ); Fri, 8 Jan 2016 01:03:32 -0500 Date: Fri, 8 Jan 2016 14:01:12 +0800 From: Peter Chen To: Sudip Mukherjee Cc: Felipe Balbi , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [PATCH] usb: gadget: fix error handling Message-ID: <20160108060112.GB26697@shlinux2> References: <1452171637-25143-1-git-send-email-sudipm.mukherjee@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452171637-25143-1-git-send-email-sudipm.mukherjee@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 07, 2016 at 06:30:37PM +0530, Sudip Mukherjee wrote: > 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. > %s/incase of/in case of Reviewed-by: Peter Cen > Signed-off-by: Sudip Mukherjee > --- > 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 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Best Regards, Peter Chen