git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
usb
/
class
/
usbtmc.c
diff --git
a/drivers/usb/class/usbtmc.c
b/drivers/usb/class/usbtmc.c
index
6a54634
..
385acb8
100644
(file)
--- a/
drivers/usb/class/usbtmc.c
+++ b/
drivers/usb/class/usbtmc.c
@@
-483,7
+483,7
@@
static ssize_t usbtmc_read(struct file *filp, char __user *buf,
}
done += n_characters;
- /* Terminate if end-of-message bit rec
ie
ved from device */
+ /* Terminate if end-of-message bit rec
ei
ved from device */
if ((buffer[8] & 0x01) && (actual >= n_characters + 12))
remaining = 0;
else