git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
phy
/
icplus.c
diff --git
a/drivers/net/phy/icplus.c
b/drivers/net/phy/icplus.c
index
9a09e24
..
d4cbc29
100644
(file)
--- a/
drivers/net/phy/icplus.c
+++ b/
drivers/net/phy/icplus.c
@@
-109,11
+109,7
@@
static int ip1001_config_init(struct phy_device *phydev)
value = phy_read(phydev, 16);
value |= 0x3;
- err = phy_write(phydev, 16, value);
- if (err < 0)
- return err;
-
- return err;
+ return phy_write(phydev, 16, value);
}
static int ip175c_read_status(struct phy_device *phydev)