]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
uas: Do not log urb status error on cancellation
authorHans de Goede <hdegoede@redhat.com>
Sat, 13 Sep 2014 10:26:44 +0000 (12:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Sep 2014 04:42:11 +0000 (21:42 -0700)
Check for both type of cancellation codes for sense and data urbs.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/storage/uas.c

index c69b9c5bb26538136e0268dffe53f258cdcb353d..e5f3e9881247aae61d77a084af60af30821dc31f 100644 (file)
@@ -318,10 +318,7 @@ static void uas_stat_cmplt(struct urb *urb)
                goto out;
 
        if (urb->status) {
-               if (urb->status == -ENOENT) {
-                       dev_err(&urb->dev->dev, "stat urb: killed, stream %d\n",
-                               urb->stream_id);
-               } else {
+               if (urb->status != -ENOENT && urb->status != -ECONNRESET) {
                        dev_err(&urb->dev->dev, "stat urb: status %d\n",
                                urb->status);
                }
@@ -428,7 +425,7 @@ static void uas_data_cmplt(struct urb *urb)
        }
 
        if (urb->status) {
-               if (urb->status != -ECONNRESET) {
+               if (urb->status != -ENOENT && urb->status != -ECONNRESET) {
                        uas_log_cmd_state(cmnd, __func__);
                        scmd_printk(KERN_ERR, cmnd,
                                "data cmplt err %d stream %d\n",