diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
commit | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch) | |
tree | dacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /drivers/usb/serial/usb-serial.c | |
parent | 6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff) | |
parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
download | op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.zip op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 12c1694..e06a41b 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -464,8 +464,10 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int length += sprintf (page+length, " path:%s", tmp); length += sprintf (page+length, "\n"); - if ((length + begin) > (off + count)) + if ((length + begin) > (off + count)) { + usb_serial_put(serial); goto done; + } if ((length + begin) < off) { begin += length; length = 0; |