FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-11 03:48:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next

Browse Source 
Marc Kleine-Budde says:

====================
this pull request is for net-next, for the v3.7 release cycle.
AnilKumar Ch contributed a fix for a segfault in the c_can driver,
which is triggered by an earlier commit [1] in net-next (so no backport
is needed).
...
[1] 4cdd34b can: c_can: Add runtime PM support to Bosch C_CAN/D_CAN controller
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-09-28 18:46:29 -04:00
commit 24cad1b4ce
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/can/c_can/c_can.c
View File

@ -1265,9 +1265,6 @@ void unregister_c_can_dev(struct net_device *dev)
{ {
struct c_can_priv *priv = netdev_priv(dev); struct c_can_priv *priv = netdev_priv(dev);
/* disable all interrupts */
c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS);
unregister_candev(dev); unregister_candev(dev);
c_can_pm_runtime_disable(priv); c_can_pm_runtime_disable(priv);