diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /drivers/usb/net/rtl8150.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/usb/net/rtl8150.c')
| -rw-r--r-- | drivers/usb/net/rtl8150.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index a72685b96061..2364c2099387 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c | |||
| @@ -438,7 +438,7 @@ static void read_bulk_callback(struct urb *urb, struct pt_regs *regs) | |||
| 438 | break; | 438 | break; |
| 439 | case -ENOENT: | 439 | case -ENOENT: |
| 440 | return; /* the urb is in unlink state */ | 440 | return; /* the urb is in unlink state */ |
| 441 | case -ETIMEDOUT: | 441 | case -ETIME: |
| 442 | warn("may be reset is needed?.."); | 442 | warn("may be reset is needed?.."); |
| 443 | goto goon; | 443 | goto goon; |
| 444 | default: | 444 | default: |