3771176c9e
The following patches are dropped because they are merged upstream: -0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch -0006-usb-drop-deprecated-symbols.patch -0009-MIPS-ath79-add-lots-of-missing-registers.patch -0010-MIPS-ath79-add-support-for-QCA953x-QCA956x-TP9343.patch -0014-MIPS-ath79-finetune-cpu-overrides.patch -0015-MIPS-ath79-enable-uart-during-early_prink.patch -0016-MIPS-ath79-get-PCIe-controller-out-of-reset.patch This patch is dropped due to the introduction of spi-mem framework: -461-spi-ath79-add-fast-flash-read.patch Thank to Michael Marley @mamarley for his work on this patch: -910-unaligned_access_hacks.patch Signed-off-by: Chuanhong Guo <gch981213@gmail.com> [synchronized kernel config with make kernel_oldconfig] Signed-off-by: Petr Štetiar <ynezz@true.cz>
33 lines
928 B
Diff
33 lines
928 B
Diff
--- a/drivers/net/phy/mdio-bitbang.c
|
|
+++ b/drivers/net/phy/mdio-bitbang.c
|
|
@@ -155,7 +155,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);
|
|
@@ -165,19 +165,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);
|