diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /drivers/usb/net/rtl8150.c | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
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: |