diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:37:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 21:37:09 +0200 |
| commit | c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7 (patch) | |
| tree | fd013d6f38b25fd1c3890a7f4ad9aa25311e7f54 /drivers/net | |
| parent | 49121304a9831449a841ca0c77dc0ad8697e23c9 (diff) | |
| parent | 778435045a416da71f1757a80e37200a5ea5af70 (diff) | |
| download | blackbird-op-linux-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.tar.gz blackbird-op-linux-c1f9c4227ca2c5bc64abbde3d9d63fd8c06571d7.zip | |
Merge branch 'v3.5-rc7-fixes' of git://github.com/lunn/linux into fixes
From Andrew Lunn <andrew@lunn.ch>:
* 'v3.5-rc7-fixes' of git://github.com/lunn/linux:
ARM: Kirkwood: Replace mrvl with marvell
ARM: Orion: fix driver probe error handling with respect to clk
ARM: Dove: Fixup ge00 initialisation
ARM: Kirkwood: Fix PHY disable clk problems
ARM: Kirkwood: Ensure runit clock always ticks.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 770ee557924c..087b9e0669f1 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2983,6 +2983,12 @@ static int mv643xx_eth_probe(struct platform_device *pdev) return 0; out: +#if defined(CONFIG_HAVE_CLK) + if (!IS_ERR(mp->clk)) { + clk_disable_unprepare(mp->clk); + clk_put(mp->clk); + } +#endif free_netdev(dev); return err; |
