projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-cpufreq' and 'pm-devfreq'
[cascardo/linux.git]
/
drivers
/
net
/
phy
/
mdio-xgene.c
diff --git
a/drivers/net/phy/mdio-xgene.c
b/drivers/net/phy/mdio-xgene.c
index
7756748
..
92af182
100644
(file)
--- a/
drivers/net/phy/mdio-xgene.c
+++ b/
drivers/net/phy/mdio-xgene.c
@@
-424,10
+424,8
@@
static int xgene_mdio_remove(struct platform_device *pdev)
mdiobus_unregister(mdio_bus);
mdiobus_free(mdio_bus);
- if (dev->of_node) {
- if (IS_ERR(pdata->clk))
- clk_disable_unprepare(pdata->clk);
- }
+ if (dev->of_node)
+ clk_disable_unprepare(pdata->clk);
return 0;
}