diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/usb/class/usbtmc.c | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/class/usbtmc.c')
-rw-r--r-- | drivers/usb/class/usbtmc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 3e7c1b800ebb..385acb895ab3 100644 --- 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, | |||
483 | } | 483 | } |
484 | 484 | ||
485 | done += n_characters; | 485 | done += n_characters; |
486 | /* Terminate if end-of-message bit recieved from device */ | 486 | /* Terminate if end-of-message bit received from device */ |
487 | if ((buffer[8] & 0x01) && (actual >= n_characters + 12)) | 487 | if ((buffer[8] & 0x01) && (actual >= n_characters + 12)) |
488 | remaining = 0; | 488 | remaining = 0; |
489 | else | 489 | else |
@@ -987,6 +987,7 @@ static const struct file_operations fops = { | |||
987 | .open = usbtmc_open, | 987 | .open = usbtmc_open, |
988 | .release = usbtmc_release, | 988 | .release = usbtmc_release, |
989 | .unlocked_ioctl = usbtmc_ioctl, | 989 | .unlocked_ioctl = usbtmc_ioctl, |
990 | .llseek = default_llseek, | ||
990 | }; | 991 | }; |
991 | 992 | ||
992 | static struct usb_class_driver usbtmc_class = { | 993 | static struct usb_class_driver usbtmc_class = { |