diff options
| author | David S. Miller <davem@davemloft.net> | 2016-12-03 15:26:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-03 15:26:30 -0500 |
| commit | 70278b5df1f932bd1a5a3fd55489cbeff4cfd25f (patch) | |
| tree | a120035c2c24c77624c9db06efa304c79a313c64 /drivers/net/can | |
| parent | b91dce4c5bc9b4454e25695c0dae5355df79a4e9 (diff) | |
| parent | 0d8f8efd32bace9f222fcc92d4a3132d877e5df6 (diff) | |
| download | linux-70278b5df1f932bd1a5a3fd55489cbeff4cfd25f.tar.gz linux-70278b5df1f932bd1a5a3fd55489cbeff4cfd25f.tar.bz2 linux-70278b5df1f932bd1a5a3fd55489cbeff4cfd25f.zip | |
Merge tag 'linux-can-next-for-4.10-20161201' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2016-12-01
this is a pull request of 4 patches for net-next/master.
There are two patches by Chris Paterson for the rcar_can and rcar_canfd
device tree binding documentation. And a patch by Geert Uytterhoeven
that corrects the order of interrupt specifiers.
The fourth patch by Colin Ian King fixes a spelling error in the
kvaser_usb driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/kvaser_usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c index d51e0c401b48..18cc529fb807 100644 --- a/drivers/net/can/usb/kvaser_usb.c +++ b/drivers/net/can/usb/kvaser_usb.c @@ -459,7 +459,7 @@ struct kvaser_usb { struct usb_endpoint_descriptor *bulk_in, *bulk_out; struct usb_anchor rx_submitted; - /* @max_tx_urbs: Firmware-reported maximum number of oustanding, + /* @max_tx_urbs: Firmware-reported maximum number of outstanding, * not yet ACKed, transmissions on this device. This value is * also used as a sentinel for marking free tx contexts. */ @@ -2027,7 +2027,7 @@ static int kvaser_usb_probe(struct usb_interface *intf, ((dev->fw_version >> 16) & 0xff), (dev->fw_version & 0xffff)); - dev_dbg(&intf->dev, "Max oustanding tx = %d URBs\n", dev->max_tx_urbs); + dev_dbg(&intf->dev, "Max outstanding tx = %d URBs\n", dev->max_tx_urbs); err = kvaser_usb_get_card_info(dev); if (err) { |