diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2020-01-27 17:48:30 +0100 |
|---|---|---|
| committer | Miquel Raynal <miquel.raynal@bootlin.com> | 2020-01-27 17:48:30 +0100 |
| commit | 701ddf0bbfc761b8bdc974ce9c4e05f9833683e3 (patch) | |
| tree | 1009975aacf14d36cc280dfeef1a9a816fa16ef8 /drivers/usb/common/usb-conn-gpio.c | |
| parent | 0dcf2572710d68c305e58946c435ddf67ea16bf3 (diff) | |
| parent | ccfb9299a0b63da4fde607c822e1470472a46177 (diff) | |
Merge tag 'spi-nor/for-5.6' into mtd/next
SPI NOR core changes:
- Add support for TB selection using SR bit 6,
- Add support for few flashes.
Diffstat (limited to 'drivers/usb/common/usb-conn-gpio.c')
| -rw-r--r-- | drivers/usb/common/usb-conn-gpio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c index 87338f9eb5be..ed204cbb63ea 100644 --- a/drivers/usb/common/usb-conn-gpio.c +++ b/drivers/usb/common/usb-conn-gpio.c @@ -156,7 +156,8 @@ static int usb_conn_probe(struct platform_device *pdev) info->vbus = devm_regulator_get(dev, "vbus"); if (IS_ERR(info->vbus)) { - dev_err(dev, "failed to get vbus\n"); + if (PTR_ERR(info->vbus) != -EPROBE_DEFER) + dev_err(dev, "failed to get vbus\n"); return PTR_ERR(info->vbus); } |