From 51b361737bcec832ea07650e27f93098e44c834b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sat, 13 Sep 2014 12:26:44 +0200 Subject: [PATCH] uas: Do not log urb status error on cancellation Check for both type of cancellation codes for sense and data urbs. Signed-off-by: Hans de Goede Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/uas.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c index c69b9c5bb265..e5f3e9881247 100644 --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -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", -- 2.39.5