Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: cdc-acm: fix potential null-pointer dereference on disconnect
  USB: cdc-acm: fix potential null-pointer dereference
  USB: cdc-acm: fix memory corruption / panic
  USB: Fix 'bad dma' problem on WDM device disconnect
  usb: wwan: fix compilation without CONFIG_PM_RUNTIME
  USB: uss720 fixup refcount position
  usb: musb: blackfin: fix typo in new bfin_musb_vbus_status func
  usb: musb: blackfin: fix typo in new dev_pm_ops struct
  usb: musb: blackfin: fix typo in platform driver name
  usb: musb: Fix for merge issue
  ehci-hcd: Bug fix: don't set a QH's Halt bit
  USB: Do not pass negative length to snoop_urb()

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index f7a205738032..8b1d94a76914 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -177,12 +177,11 @@ static struct uss720_async_request *submit_async_request(struct parport_uss720_p
         spin_lock_irqsave(&priv->asynclock, flags);
         list_add_tail(&rq->asynclist, &priv->asynclist);
         spin_unlock_irqrestore(&priv->asynclock, flags);
+        kref_get(&rq->ref_count);
         ret = usb_submit_urb(rq->urb, mem_flags);
-        if (!ret) {
-                kref_get(&rq->ref_count);
+        if (!ret)
                 return rq;
-        }
-        kref_put(&rq->ref_count, destroy_async);
+        destroy_async(&rq->ref_count);
         err("submit_async_request submit_urb failed with %d", ret);
         return NULL;
 }