diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-21 13:49:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-21 13:50:16 -0400 |
| commit | e0c7a4a1a6c4ace4a176b95cb5089f55452c625e (patch) | |
| tree | d35dc4bb27212b27a9696d43f5b7b50a67396bbc | |
| parent | dc9c9759ebc65d886453c335b2b5be39f87ab01e (diff) | |
| parent | ab04c8bd423edb03e2148350a091836c196107fc (diff) | |
| download | linux-3.10-e0c7a4a1a6c4ace4a176b95cb5089f55452c625e.tar.gz linux-3.10-e0c7a4a1a6c4ace4a176b95cb5089f55452c625e.tar.bz2 linux-3.10-e0c7a4a1a6c4ace4a176b95cb5089f55452c625e.zip | |
Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
two patches for the v3.6 release cycle. Ira W. Snyder fixed support for the
older version of the Janz CMOD-IO Carrier Board. I found and fixed an oops in
the ti_hecc driver, which occurs when removing the module if the network
interface is still open.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/can/janz-ican3.c | 4 | ||||
| -rw-r--r-- | drivers/net/can/ti_hecc.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c index 98ee4381991..7edadee487b 100644 --- a/drivers/net/can/janz-ican3.c +++ b/drivers/net/can/janz-ican3.c @@ -1391,7 +1391,6 @@ static irqreturn_t ican3_irq(int irq, void *dev_id) */ static int ican3_reset_module(struct ican3_dev *mod) { - u8 val = 1 << mod->num; unsigned long start; u8 runold, runnew; @@ -1405,8 +1404,7 @@ static int ican3_reset_module(struct ican3_dev *mod) runold = ioread8(mod->dpm + TARGET_RUNNING); /* reset the module */ - iowrite8(val, &mod->ctrl->reset_assert); - iowrite8(val, &mod->ctrl->reset_deassert); + iowrite8(0x00, &mod->dpmctrl->hwreset); /* wait until the module has finished resetting and is running */ start = jiffies; diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c index 527dbcf9533..9ded21e79db 100644 --- a/drivers/net/can/ti_hecc.c +++ b/drivers/net/can/ti_hecc.c @@ -984,12 +984,12 @@ static int __devexit ti_hecc_remove(struct platform_device *pdev) struct net_device *ndev = platform_get_drvdata(pdev); struct ti_hecc_priv *priv = netdev_priv(ndev); + unregister_candev(ndev); clk_disable(priv->clk); clk_put(priv->clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); iounmap(priv->base); release_mem_region(res->start, resource_size(res)); - unregister_candev(ndev); free_candev(ndev); platform_set_drvdata(pdev, NULL); |