diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-09-28 18:46:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-28 18:46:29 -0400 |
| commit | 24cad1b4ce9e9da6ec22cfc9361bbbe0ba4f80cc (patch) | |
| tree | 75b54b9c0003e33140fa08119a5886bcebef500b | |
| parent | 6c636503260d1a5598f44f940f284cf679dc38f9 (diff) | |
| parent | c523530ce17defe6b28ccfe622c506488f430866 (diff) | |
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>
| -rw-r--r-- | drivers/net/can/c_can/c_can.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/can/c_can/c_can.c b/drivers/net/can/c_can/c_can.c index 2c4a21f9844..e5180dfddba 100644 --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c @@ -1265,9 +1265,6 @@ void unregister_c_can_dev(struct net_device *dev) { struct c_can_priv *priv = netdev_priv(dev); - /* disable all interrupts */ - c_can_enable_all_interrupts(priv, DISABLE_ALL_INTERRUPTS); - unregister_candev(dev); c_can_pm_runtime_disable(priv); |