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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
phy
/
phy_device.c
diff --git
a/drivers/net/phy/phy_device.c
b/drivers/net/phy/phy_device.c
index
55bc24b
..
b344a0b
100644
(file)
--- a/
drivers/net/phy/phy_device.c
+++ b/
drivers/net/phy/phy_device.c
@@
-74,7
+74,7
@@
int phy_register_fixup(const char *bus_id, u32 phy_uid, u32 phy_uid_mask,
if (!fixup)
return -ENOMEM;
if (!fixup)
return -ENOMEM;
- str
ncpy(fixup->bus_id, bus_id, BUS_ID_SIZE
);
+ str
lcpy(fixup->bus_id, bus_id, sizeof(fixup->bus_id)
);
fixup->phy_uid = phy_uid;
fixup->phy_uid_mask = phy_uid_mask;
fixup->run = run;
fixup->phy_uid = phy_uid;
fixup->phy_uid_mask = phy_uid_mask;
fixup->run = run;
@@
-109,7
+109,7
@@
EXPORT_SYMBOL(phy_register_fixup_for_id);
*/
static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup)
{
*/
static int phy_needs_fixup(struct phy_device *phydev, struct phy_fixup *fixup)
{
- if (strcmp(fixup->bus_id,
phydev->dev.bus_id
) != 0)
+ if (strcmp(fixup->bus_id,
dev_name(&phydev->dev)
) != 0)
if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0)
return 0;
if (strcmp(fixup->bus_id, PHY_ANY_ID) != 0)
return 0;