diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-03 09:57:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-03 09:57:54 -0500 |
commit | ed75e1ac1cabbe517fe959f06ff02e01a660a32f (patch) | |
tree | 9785da0182ff3bdc65999dd2fd9b4ede12f812d8 /drivers/net/can/sja1000/peak_pci.c | |
parent | stmmac: reset last TSO segment size after device open (diff) | |
parent | can: mcba_usb: fix device disconnect bug (diff) | |
download | linux-dev-ed75e1ac1cabbe517fe959f06ff02e01a660a32f.tar.xz linux-dev-ed75e1ac1cabbe517fe959f06ff02e01a660a32f.zip |
Merge tag 'linux-can-fixes-for-4.15-20171201' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2017-12-01
this is a pull for net consisting of nine patches.
The first three patches are by Jimmy Assarsson for the kvaser_usb driver
and add the missing free()s in some error path, a signed/unsigned
comparison and ratelimit the error messages in case of incomplete
messages. Oliver Stäbler's patch for the ti_hecc driver fix the napi
poll function's return value. The return values of the probe function of
the peak_canfd and peak_pci PCI drivers are fixed by Stephane Grosjean's
patch. Two patches by me for the flexcan driver update the
bugs/features/quirks overview table and fix the error state transition
for the VF610 SoC. The two patches by Martin Kelly for the mcba_usb
driver fix a typo and a device disconnect bug.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/sja1000/peak_pci.c')
-rw-r--r-- | drivers/net/can/sja1000/peak_pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c index 131026fbc2d7..5adc95c922ee 100644 --- a/drivers/net/can/sja1000/peak_pci.c +++ b/drivers/net/can/sja1000/peak_pci.c @@ -717,7 +717,10 @@ failure_release_regions: failure_disable_pci: pci_disable_device(pdev); - return err; + /* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while + * the probe() function must return a negative errno in case of failure + * (err is unchanged if negative) */ + return pcibios_err_to_errno(err); } static void peak_pci_remove(struct pci_dev *pdev) |