Commit 761cfa97 authored by Lukas Wunner's avatar Lukas Wunner Committed by David S. Miller

net: ks8851: Reassert reset pin if chip ID check fails

Commit 73fdeb82 ("net: ks8851: Add optional vdd_io regulator and
reset gpio") amended the ks8851 driver to briefly assert the chip's
reset pin on probe. It also amended the probe routine's error path to
reassert the reset pin if a subsequent initialization step fails.

However the commit misplaced reassertion of the reset pin in the error
path such that it is not performed if the check of the Chip ID and
Enable Register (CIDER) fails. The error path is therefore slightly
asymmetrical to the probe routine's body. Fix it.
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Cc: Frank Pavlic <f.pavlic@kunbus.de>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 536d3680
...@@ -1554,9 +1554,9 @@ static int ks8851_probe(struct spi_device *spi) ...@@ -1554,9 +1554,9 @@ static int ks8851_probe(struct spi_device *spi)
free_irq(ndev->irq, ks); free_irq(ndev->irq, ks);
err_irq: err_irq:
err_id:
if (gpio_is_valid(gpio)) if (gpio_is_valid(gpio))
gpio_set_value(gpio, 0); gpio_set_value(gpio, 0);
err_id:
regulator_disable(ks->vdd_reg); regulator_disable(ks->vdd_reg);
err_reg: err_reg:
regulator_disable(ks->vdd_io); regulator_disable(ks->vdd_io);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment