From: Rahul Ruikar <rahul.ruikar@gmail.com>
To: David Brownell <dbrownell@users.sourceforge.net>,
Greg Kroah-Hartman <gregkh@suse.de>,
Dan Carpenter <error27@gmail.com>,
nm127@freemail.hu
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Rahul Ruikar <rahul.ruikar@gmail.com>
Subject: [PATCH] usb: gadget: goku_udc: Fix error path
Date: Sun, 3 Oct 2010 19:40:16 +0530 [thread overview]
Message-ID: <1286115016-2759-1-git-send-email-rahul.ruikar@gmail.com> (raw)
call put_device() when device_register() fails.
Signed-off-by: Rahul Ruikar <rahul.ruikar@gmail.com>
---
drivers/usb/gadget/goku_udc.c | 7 ++++++-
drivers/usb/gadget/goku_udc.h | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 1088d08..080779b 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1847,8 +1847,13 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
/* done */
the_controller = dev;
retval = device_register(&dev->gadget.dev);
- if (retval == 0)
+ if (retval != 0) {
+ dev_reg_status = 2;
+ goto done;
+ } else {
+ dev_reg_status = 1;
return 0;
+ }
done:
if (dev)
diff --git a/drivers/usb/gadget/goku_udc.h b/drivers/usb/gadget/goku_udc.h
index 566cb23..c27b9e2 100644
--- a/drivers/usb/gadget/goku_udc.h
+++ b/drivers/usb/gadget/goku_udc.h
@@ -251,7 +251,8 @@ struct goku_udc {
got_region:1,
req_config:1,
configured:1,
- enabled:1;
+ enabled:1,
+ dev_reg_status:2;
/* pci state used to access those endpoints */
struct pci_dev *pdev;
--
1.7.2.3
next reply other threads:[~2010-10-03 14:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-03 14:10 Rahul Ruikar [this message]
2010-10-03 16:17 ` Dan Carpenter
2010-10-04 10:46 ` Sergei Shtylyov
2010-10-04 10:50 ` Rahul Ruikar
2010-10-03 19:59 [RESEND/PATCH] " Rahul Ruikar
2010-10-04 12:22 ` Dan Carpenter
2010-10-05 13:20 ` Greg KH
2010-10-05 16:55 ` [PATCH] " Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1286115016-2759-1-git-send-email-rahul.ruikar@gmail.com \
--to=rahul.ruikar@gmail.com \
--cc=dbrownell@users.sourceforge.net \
--cc=error27@gmail.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=nm127@freemail.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®