Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 796e2f68f749..8b1d94a76914 100644
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -3,7 +3,7 @@
 /*
  *      uss720.c  --  USS720 USB Parport Cable.
  *
- *      Copyright (C) 1999, 2005
+ *      Copyright (C) 1999, 2005, 2010
  *          Thomas Sailer (t.sailer@alumni.ethz.ch)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -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;
 }
@@ -776,6 +775,7 @@ static const struct usb_device_id uss720_table[] = {
         { USB_DEVICE(0x0557, 0x2001) },
         { USB_DEVICE(0x0729, 0x1284) },
         { USB_DEVICE(0x1293, 0x0002) },
+        { USB_DEVICE(0x050d, 0x0002) },
         { }                                             /* Terminating entry */
 };