1 files changed, 8 insertions, 14 deletions

diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
index 71579e4d2fce..f752698669d2 100644
--- a/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
@@ -102,7 +102,7 @@ static void ar9170_usb_tx_urb_complete_free(struct urb *urb)
         struct ar9170_usb *aru = (struct ar9170_usb *)
               usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
 
-        if (!aru) {
+        if (unlikely(!aru)) {
                 dev_kfree_skb_irq(skb);
                 return ;
         }
@@ -135,8 +135,8 @@ static void ar9170_usb_irq_completed(struct urb *urb)
                 goto resubmit;
         }
 
-        print_hex_dump_bytes("ar9170 irq: ", DUMP_PREFIX_OFFSET,
-                             urb->transfer_buffer, urb->actual_length);
+        ar9170_handle_command_response(&aru->common, urb->transfer_buffer,
+                                       urb->actual_length);
 
 resubmit:
         usb_anchor_urb(urb, &aru->rx_submitted);
@@ -186,16 +186,15 @@ resubmit:
 
         usb_anchor_urb(urb, &aru->rx_submitted);
         err = usb_submit_urb(urb, GFP_ATOMIC);
-        if (err) {
+        if (unlikely(err)) {
                 usb_unanchor_urb(urb);
-                dev_kfree_skb_irq(skb);
+                goto free;
         }
 
         return ;
 
 free:
         dev_kfree_skb_irq(skb);
-        return;
 }
 
 static int ar9170_usb_prep_rx_urb(struct ar9170_usb *aru,
@@ -346,7 +345,7 @@ static int ar9170_usb_exec_cmd(struct ar9170 *ar, enum ar9170_cmd cmd,
 
         usb_anchor_urb(urb, &aru->tx_submitted);
         err = usb_submit_urb(urb, GFP_ATOMIC);
-        if (err) {
+        if (unlikely(err)) {
                 usb_unanchor_urb(urb);
                 usb_free_urb(urb);
                 goto err_unbuf;
@@ -427,7 +426,7 @@ static void ar9170_usb_callback_cmd(struct ar9170 *ar, u32 len , void *buffer)
         unsigned long flags;
         u32 in, out;
 
-        if (!buffer)
+        if (unlikely(!buffer))
                 return ;
 
         in = le32_to_cpup((__le32 *)buffer);
@@ -728,7 +727,7 @@ static int ar9170_usb_probe(struct usb_interface *intf,
 
 #ifdef CONFIG_PM
         udev->reset_resume = 1;
-#endif
+#endif /* CONFIG_PM */
         err = ar9170_usb_reset(aru);
         if (err)
                 goto err_freehw;
@@ -813,11 +812,6 @@ static int ar9170_resume(struct usb_interface *intf)
         usb_unpoison_anchored_urbs(&aru->rx_submitted);
         usb_unpoison_anchored_urbs(&aru->tx_submitted);
 
-        /*
-         * FIXME: firmware upload will fail on resume.
-         * but this is better than a hang!
-         */
-
         err = ar9170_usb_init_device(aru);
         if (err)
                 goto err_unrx;