From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760104Ab0JGDwd (ORCPT ); Wed, 6 Oct 2010 23:52:33 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:57667 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760005Ab0JGDwc (ORCPT ); Wed, 6 Oct 2010 23:52:32 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=M5ws5YN6R+LBfdjqYBDGp+GqZSatEGQxFoNhYMZjbDnF5FJwQFqQoXr6lHpmQTfA9g HC0QGpzyTUDxNXirEDsWAjCi3CRT5pQD89puiLlu5DL3QR9+nx8ZcHxr9/Vzojpn5kbW EGJio2Fm4/INfKEl1Yln+sZ/7814jM0LpK6Y8= From: Rahul Ruikar To: David Brownell , Greg Kroah-Hartman , Joe Perches Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Rahul Ruikar Subject: [PATCH] usb: gadget: langwell_udc: Fix error path Date: Thu, 7 Oct 2010 09:22:06 +0530 Message-Id: <1286423526-2777-1-git-send-email-rahul.ruikar@gmail.com> X-Mailer: git-send-email 1.7.2.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix for following cases - Call device_unregister() only when device_register() succeeds. - Call put_device() when device_register() fails. - Call device_remove_file() only when device_create_file() succeeds. Signed-off-by: Rahul Ruikar --- drivers/usb/gadget/langwell_udc.c | 14 +++++++++++--- drivers/usb/gadget/langwell_udc.h | 4 +++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/usb/gadget/langwell_udc.c b/drivers/usb/gadget/langwell_udc.c index c2d2a20..56e216e 100644 --- a/drivers/usb/gadget/langwell_udc.c +++ b/drivers/usb/gadget/langwell_udc.c @@ -2952,8 +2952,11 @@ static void langwell_udc_remove(struct pci_dev *pdev) INFO(dev, "unbind\n"); DBG(dev, "<--- %s()\n", __func__); - device_unregister(&dev->gadget.dev); - device_remove_file(&pdev->dev, &dev_attr_langwell_udc); + if (dev->reg_status) + device_unregister(&dev->gadget.dev); + + if (dev->file_created) + device_remove_file(&pdev->dev, &dev_attr_langwell_udc); #ifndef OTG_TRANSCEIVER pci_set_drvdata(pdev, NULL); @@ -3190,13 +3193,18 @@ static int langwell_udc_probe(struct pci_dev *pdev, the_controller = dev; retval = device_register(&dev->gadget.dev); - if (retval) + if (retval) { + put_device(&dev->gadget.dev); goto error; + } + dev->reg_status = 1; retval = device_create_file(&pdev->dev, &dev_attr_langwell_udc); if (retval) goto error; + dev->file_created = 1; + VDBG(dev, "<--- %s()\n", __func__); return 0; diff --git a/drivers/usb/gadget/langwell_udc.h b/drivers/usb/gadget/langwell_udc.h index 9719934..da40671 100644 --- a/drivers/usb/gadget/langwell_udc.h +++ b/drivers/usb/gadget/langwell_udc.h @@ -199,7 +199,9 @@ struct langwell_udc { vbus_active:1, suspended:1, stopped:1, - lpm:1; /* LPM capability */ + lpm:1, /* LPM capability */ + reg_status:1, + file_created:1; /* pci state used to access those endpoints */ struct pci_dev *pdev; -- 1.7.2.3