From: Aaro Koskinen Date: Sat, 21 Nov 2015 23:08:54 +0000 (+0200) Subject: broadcom: fix PHY_ID_BCM5481 entry in the id table X-Git-Tag: v3.16.35~898 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85c09e71e841ce7c39acac7a015ef27f27fdcc75;p=thirdparty%2Fkernel%2Fstable.git broadcom: fix PHY_ID_BCM5481 entry in the id table commit 3c25a860d17b7378822f35d8c9141db9507e3beb upstream. 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 Signed-off-by: David S. Miller Signed-off-by: Luis Henriques --- diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 34088d60da746..254a8f2fe2356 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -796,7 +796,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 },