From 8f6a572cac0a3a80a66ef47ed2a8df36ebf745cb Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Mon, 30 Apr 2012 09:57:31 +0200 Subject: [PATCH] --- yaml --- r: 303656 b: refs/heads/master c: 12a98b2bd8050b3cf28b50da612c484cdf174368 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-wdm.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 49edc9e8965a..b11b9cc221b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 880bca3a2a6f159d7453e0cbcbfe2f1d8204d907 +refs/heads/master: 12a98b2bd8050b3cf28b50da612c484cdf174368 diff --git a/trunk/drivers/usb/class/cdc-wdm.c b/trunk/drivers/usb/class/cdc-wdm.c index 4e8451ca2d6c..cd017a914c5d 100644 --- a/trunk/drivers/usb/class/cdc-wdm.c +++ b/trunk/drivers/usb/class/cdc-wdm.c @@ -368,6 +368,7 @@ static ssize_t wdm_write r = usb_autopm_get_interface(desc->intf); if (r < 0) { kfree(buf); + rv = usb_translate_errors(r); goto outnp; } @@ -383,6 +384,7 @@ static ssize_t wdm_write if (r < 0) { kfree(buf); + rv = r; goto out; } @@ -412,6 +414,7 @@ static ssize_t wdm_write kfree(buf); clear_bit(WDM_IN_USE, &desc->flags); dev_err(&desc->intf->dev, "Tx URB error: %d\n", rv); + rv = usb_translate_errors(rv); } else { dev_dbg(&desc->intf->dev, "Tx URB has been submitted index=%d", req->wIndex); @@ -593,6 +596,7 @@ static int wdm_open(struct inode *inode, struct file *file) desc->count--; dev_err(&desc->intf->dev, "Error submitting int urb - %d\n", rv); + rv = usb_translate_errors(rv); } } else { rv = 0;