linux-can-fixes-for-4.2-20150825

Browse source

-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABCgAGBQJV3BEJAAoJEP5prqPJtc/Hb2wH/RFxO+rBh16yZBJjFlPbn2ZQ
 VbcngZtowJle9kjTBINCN/8KsjOhdpn9oT8iOxVcrwyxPa/gWcqnz7cip9regabu
 6fOnIlmCnomJ9E/9Gt4joqsB14Zlbubn4xU+VJacZRDjXktJSeHGexxYHnAsROC6
 V4W2yIySd5T1UvlzSCbbugRLa9c0ROtLj2RxdHrTicbmcyQrA/bvErACFGtlInso
 PV6YLFk+ESk3RH0vl2FxUkNC2g7QiKp7zhX9eAuDkEg2CIYCL1sNQt6eAQMPaRbc
 o9u60JLbqiXrKbvlmOGBnIPqkBWxbYX3Jo9Qc4bEyS93Gzdn73kMwnFbMgd8Oek=
 =JbLo
 -----END PGP SIGNATURE-----

Merge tag 'linux-can-fixes-for-4.2-20150825' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
this is the updated pull request of one patch by me for the peak_usb
driver. It fixes the driver, so that non FD adapters don't provide CAN
FD bittimings.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-08-25 16:12:45 -07:00

parent 83bc805bff 06b23f7fbb

commit e732cdd416

5 changed files with 82 additions and 70 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

24

drivers/net/can/usb/peak_usb/pcan_usb.c

View file

4

drivers/net/can/usb/peak_usb/pcan_usb_core.c

View file

4

drivers/net/can/usb/peak_usb/pcan_usb_core.h

View file

96

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

View file

24

drivers/net/can/usb/peak_usb/pcan_usb_pro.c

View file