diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-22 08:58:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-22 08:58:50 +0200 |
| commit | 639e1c739bf53814b67a1d5f945d76fd4358453c (patch) | |
| tree | d3bad09907d05228851267b1ddd3ba3a6fd39fe0 /drivers/usb/dwc3/dwc3-keystone.c | |
| parent | staging: greybus: mark PM functions as __maybe_unused (diff) | |
| parent | Linux 4.12-rc2 (diff) | |
| download | linux-dev-639e1c739bf53814b67a1d5f945d76fd4358453c.tar.xz linux-dev-639e1c739bf53814b67a1d5f945d76fd4358453c.zip | |
Merge 4.12-rc2 into staging-next
We want the staging tree fixes in here as well to handle the merge
issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/dwc3/dwc3-keystone.c')
| -rw-r--r-- | drivers/usb/dwc3/dwc3-keystone.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/dwc3-keystone.c b/drivers/usb/dwc3/dwc3-keystone.c index 72664700b8a2..12ee23f53cdd 100644 --- a/drivers/usb/dwc3/dwc3-keystone.c +++ b/drivers/usb/dwc3/dwc3-keystone.c @@ -107,6 +107,10 @@ static int kdwc3_probe(struct platform_device *pdev) return PTR_ERR(kdwc->usbss); kdwc->clk = devm_clk_get(kdwc->dev, "usb"); + if (IS_ERR(kdwc->clk)) { + dev_err(kdwc->dev, "unable to get usb clock\n"); + return PTR_ERR(kdwc->clk); + } error = clk_prepare_enable(kdwc->clk); if (error < 0) { |