Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
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:
commit
24cad1b4ce
1 changed files with 0 additions and 3 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue