diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-12-08 14:37:10 +0100 |
| commit | 4f797f56c3786e2c6bc542b3f80e9a599b073976 (patch) | |
| tree | 12f311ac2a06329d58d43437243a9b777c7822f4 /drivers/usb/host/bcma-hcd.c | |
| parent | c5105d764e0214bcc4c6d40d7ba231d01b2e9dda (diff) | |
| parent | 63de37476ebd1e9bab6a9e17186dc5aa1da9ea99 (diff) | |
| download | linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.tar.gz linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.tar.bz2 linux-stable-4f797f56c3786e2c6bc542b3f80e9a599b073976.zip | |
Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/host/bcma-hcd.c')
| -rw-r--r-- | drivers/usb/host/bcma-hcd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c index 2400a826397a..652fa29beb27 100644 --- a/drivers/usb/host/bcma-hcd.c +++ b/drivers/usb/host/bcma-hcd.c @@ -406,9 +406,12 @@ static int bcma_hcd_probe(struct bcma_device *core) return -ENOMEM; usb_dev->core = core; - if (core->dev.of_node) + if (core->dev.of_node) { usb_dev->gpio_desc = devm_gpiod_get(&core->dev, "vcc", GPIOD_OUT_HIGH); + if (IS_ERR(usb_dev->gpio_desc)) + return PTR_ERR(usb_dev->gpio_desc); + } switch (core->id.id) { case BCMA_CORE_USB20_HOST: |