]> git.hungrycats.org Git - linux/commitdiff
broadcom: fix PHY_ID_BCM5481 entry in the id table
authorAaro Koskinen <aaro.koskinen@iki.fi>
Sat, 21 Nov 2015 23:08:54 +0000 (01:08 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 14 Dec 2015 17:19:26 +0000 (12:19 -0500)
[ Upstream commit 3c25a860d17b7378822f35d8c9141db9507e3beb ]

Commit fcb26ec5b18d ("broadcom: move all PHY_ID's to header")
updated broadcom_tbl to use PHY_IDs, but incorrectly replaced 0x0143bca0
with PHY_ID_BCM5482 (making a duplicate entry, and completely omitting
the original). Fix that.

Fixes: fcb26ec5b18d ("broadcom: move all PHY_ID's to header")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/net/phy/broadcom.c

index 854f2c9a7b2b5224f1dab808d16d8f514cdd486a..64860c0417453018dccd8728b8fb8361f6861cba 100644 (file)
@@ -674,7 +674,7 @@ static struct mdio_device_id __maybe_unused broadcom_tbl[] = {
        { PHY_ID_BCM5421, 0xfffffff0 },
        { PHY_ID_BCM5461, 0xfffffff0 },
        { PHY_ID_BCM5464, 0xfffffff0 },
-       { PHY_ID_BCM5482, 0xfffffff0 },
+       { PHY_ID_BCM5481, 0xfffffff0 },
        { PHY_ID_BCM5482, 0xfffffff0 },
        { PHY_ID_BCM50610, 0xfffffff0 },
        { PHY_ID_BCM50610M, 0xfffffff0 },