diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-07 08:23:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-10-07 08:23:45 +0200 |
| commit | c8fa7eed6695fb261cdeba49136ac8611e409952 (patch) | |
| tree | 43aa2bc1ee12777cb4937ed3a70cad4e12ce3d92 /drivers/usb | |
| parent | 7bf2e891a4909f1cd4c765761b05984b5ff962bb (diff) | |
| parent | 1c9e671462ad4f4e294e962417e122da2a762e65 (diff) | |
| download | barebox-c8fa7eed6695fb261cdeba49136ac8611e409952.tar.gz barebox-c8fa7eed6695fb261cdeba49136ac8611e409952.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/imx/imx-usb-phy.c | 2 | ||||
| -rw-r--r-- | drivers/usb/storage/transport.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/imx/imx-usb-phy.c b/drivers/usb/imx/imx-usb-phy.c index a573c7fe52..837c1b5176 100644 --- a/drivers/usb/imx/imx-usb-phy.c +++ b/drivers/usb/imx/imx-usb-phy.c @@ -78,7 +78,7 @@ static int imx_usbphy_probe(struct device_d *dev) imxphy->clk = clk_get(dev, NULL); if (IS_ERR(imxphy->clk)) { - dev_err(dev, "could not get clk: %s\n", strerror(-PTR_ERR(imxphy->clk))); + dev_err(dev, "could not get clk: %s\n", strerrorp(imxphy->clk)); goto err_clk; } diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index ac1fe79418..4140991340 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c @@ -54,7 +54,7 @@ static const unsigned char us_direction[256/8] = { */ /* Clear a stall on an endpoint - special for bulk-only devices */ -int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe) +static int usb_stor_Bulk_clear_endpt_stall(struct us_data *us, unsigned int pipe) { return usb_clear_halt(us->pusb_dev, pipe); } |