diff options
Diffstat (limited to 'drivers/usb/host/u132-hcd.c')
-rw-r--r-- | drivers/usb/host/u132-hcd.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index 5b31bae92dbc..fab764946c74 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c | |||
@@ -316,7 +316,6 @@ static void u132_ring_requeue_work(struct u132 *u132, struct u132_ring *ring, | |||
316 | } else if (queue_delayed_work(workqueue, &ring->scheduler, 0)) | 316 | } else if (queue_delayed_work(workqueue, &ring->scheduler, 0)) |
317 | return; | 317 | return; |
318 | kref_put(&u132->kref, u132_hcd_delete); | 318 | kref_put(&u132->kref, u132_hcd_delete); |
319 | return; | ||
320 | } | 319 | } |
321 | 320 | ||
322 | static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, | 321 | static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, |
@@ -324,7 +323,6 @@ static void u132_ring_queue_work(struct u132 *u132, struct u132_ring *ring, | |||
324 | { | 323 | { |
325 | kref_get(&u132->kref); | 324 | kref_get(&u132->kref); |
326 | u132_ring_requeue_work(u132, ring, delta); | 325 | u132_ring_requeue_work(u132, ring, delta); |
327 | return; | ||
328 | } | 326 | } |
329 | 327 | ||
330 | static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring) | 328 | static void u132_ring_cancel_work(struct u132 *u132, struct u132_ring *ring) |
@@ -543,7 +541,6 @@ static void u132_hcd_giveback_urb(struct u132 *u132, struct u132_endp *endp, | |||
543 | mutex_unlock(&u132->scheduler_lock); | 541 | mutex_unlock(&u132->scheduler_lock); |
544 | u132_endp_put_kref(u132, endp); | 542 | u132_endp_put_kref(u132, endp); |
545 | usb_hcd_giveback_urb(hcd, urb, status); | 543 | usb_hcd_giveback_urb(hcd, urb, status); |
546 | return; | ||
547 | } | 544 | } |
548 | 545 | ||
549 | static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp, | 546 | static void u132_hcd_forget_urb(struct u132 *u132, struct u132_endp *endp, |
@@ -574,8 +571,8 @@ static void u132_hcd_abandon_urb(struct u132 *u132, struct u132_endp *endp, | |||
574 | endp->active = 0; | 571 | endp->active = 0; |
575 | spin_unlock_irqrestore(&endp->queue_lock.slock, irqs); | 572 | spin_unlock_irqrestore(&endp->queue_lock.slock, irqs); |
576 | kfree(urbq); | 573 | kfree(urbq); |
577 | } usb_hcd_giveback_urb(hcd, urb, status); | 574 | } |
578 | return; | 575 | usb_hcd_giveback_urb(hcd, urb, status); |
579 | } | 576 | } |
580 | 577 | ||
581 | static inline int edset_input(struct u132 *u132, struct u132_ring *ring, | 578 | static inline int edset_input(struct u132 *u132, struct u132_ring *ring, |
@@ -3085,7 +3082,6 @@ static void u132_initialise(struct u132 *u132, struct platform_device *pdev) | |||
3085 | u132->endp[endps] = NULL; | 3082 | u132->endp[endps] = NULL; |
3086 | 3083 | ||
3087 | mutex_unlock(&u132->sw_lock); | 3084 | mutex_unlock(&u132->sw_lock); |
3088 | return; | ||
3089 | } | 3085 | } |
3090 | 3086 | ||
3091 | static int __devinit u132_probe(struct platform_device *pdev) | 3087 | static int __devinit u132_probe(struct platform_device *pdev) |