From 20ae42954b55429fa6a3d1be0ed632f1e983926f Mon Sep 17 00:00:00 2001 From: Rahul Ruikar Date: Sat, 2 Oct 2010 01:35:48 -0500 Subject: [PATCH] --- yaml --- r: 221919 b: refs/heads/master c: e2c3404523c5366c6cc1099d3237d363254adde0 h: refs/heads/master i: 221917: 47a8a7a58e7dfc5ad444d8af01884459640e0625 221915: cb26a502c0af8e9d7b98d8cdcf636e25bdf427a2 221911: 2490335792706793cf4106bba824251ac6f843a2 221903: df528eacaf4f626fb9ea05ff7ed250f79e58ae57 221887: be681279e7bfbc0baa0ed300711c7070adee6f05 v: v3 --- [refs] | 2 +- trunk/drivers/usb/musb/musb_gadget.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 92a2c6986b54..064774938d92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9001d80df9b1db946ef5d0fb52c974d74c567b86 +refs/heads/master: e2c3404523c5366c6cc1099d3237d363254adde0 diff --git a/trunk/drivers/usb/musb/musb_gadget.c b/trunk/drivers/usb/musb/musb_gadget.c index ce31f079b31e..ba22e4a20f95 100644 --- a/trunk/drivers/usb/musb/musb_gadget.c +++ b/trunk/drivers/usb/musb/musb_gadget.c @@ -1705,8 +1705,10 @@ int __init musb_gadget_setup(struct musb *musb) musb_platform_try_idle(musb, 0); status = device_register(&musb->g.dev); - if (status != 0) + if (status != 0) { + put_device(&musb->g.dev); the_gadget = NULL; + } return status; }