diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2016-12-09 14:18:00 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-12-09 23:05:16 -0500 |
| commit | ab4e4c07aca7b33f8d00c5d6b083a564660ca8a5 (patch) | |
| tree | 5715298586d832ca3c47577df26681bb293bc9bc /drivers/net/ethernet/smsc/smsc911x.c | |
| parent | ibmveth: set correct gso_size and gso_type (diff) | |
| download | linux-dev-ab4e4c07aca7b33f8d00c5d6b083a564660ca8a5.tar.xz linux-dev-ab4e4c07aca7b33f8d00c5d6b083a564660ca8a5.zip | |
net: smsc911x: back out silently on probe deferrals
When trying to get a regulator we may get deferred and we see
this noise:
smsc911x 1b800000.ethernet-ebi2 (unnamed net_device) (uninitialized):
couldn't get regulators -517
Then the driver continues anyway. Which means that the regulator
may not be properly retrieved and reference counted, and may be
switched off in case noone else is using it.
Fix this by returning silently on deferred probe and let the
system work it out.
Cc: Jeremy Linton <jeremy.linton@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/smsc/smsc911x.c')
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index e9b8579e6241..8b0016a785c0 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -438,9 +438,16 @@ static int smsc911x_request_resources(struct platform_device *pdev) ret = regulator_bulk_get(&pdev->dev, ARRAY_SIZE(pdata->supplies), pdata->supplies); - if (ret) + if (ret) { + /* + * Retry on deferrals, else just report the error + * and try to continue. + */ + if (ret == -EPROBE_DEFER) + return ret; netdev_err(ndev, "couldn't get regulators %d\n", ret); + } /* Request optional RESET GPIO */ pdata->reset_gpiod = devm_gpiod_get_optional(&pdev->dev, |