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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
can
/
usb
/
ems_usb.c
diff --git
a/drivers/net/can/usb/ems_usb.c
b/drivers/net/can/usb/ems_usb.c
index
e75f1a8
..
a72c7bf
100644
(file)
--- a/
drivers/net/can/usb/ems_usb.c
+++ b/
drivers/net/can/usb/ems_usb.c
@@
-386,7
+386,7
@@
static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg)
break;
}
- /* Error occured during transmission? */
+ /* Error occur
r
ed during transmission? */
if ((ecc & SJA1000_ECC_DIR) == 0)
cf->data[2] |= CAN_ERR_PROT_TX;