You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
928 B
Diff
33 lines
928 B
Diff
--- a/drivers/net/phy/mdio-bitbang.c
|
|
+++ b/drivers/net/phy/mdio-bitbang.c
|
|
@@ -152,7 +152,7 @@ static int mdiobb_cmd_addr(struct mdiobb
|
|
static int mdiobb_read(struct mii_bus *bus, int phy, int reg)
|
|
{
|
|
struct mdiobb_ctrl *ctrl = bus->priv;
|
|
- int ret, i;
|
|
+ int ret;
|
|
|
|
if (reg & MII_ADDR_C45) {
|
|
reg = mdiobb_cmd_addr(ctrl, phy, reg);
|
|
@@ -162,19 +162,7 @@ static int mdiobb_read(struct mii_bus *b
|
|
|
|
ctrl->ops->set_mdio_dir(ctrl, 0);
|
|
|
|
- /* check the turnaround bit: the PHY should be driving it to zero, if this
|
|
- * PHY is listed in phy_ignore_ta_mask as having broken TA, skip that
|
|
- */
|
|
- if (mdiobb_get_bit(ctrl) != 0 &&
|
|
- !(bus->phy_ignore_ta_mask & (1 << phy))) {
|
|
- /* PHY didn't drive TA low -- flush any bits it
|
|
- * may be trying to send.
|
|
- */
|
|
- for (i = 0; i < 32; i++)
|
|
- mdiobb_get_bit(ctrl);
|
|
-
|
|
- return 0xffff;
|
|
- }
|
|
+ mdiobb_get_bit(ctrl);
|
|
|
|
ret = mdiobb_get_num(ctrl, 16);
|
|
mdiobb_get_bit(ctrl);
|