diff options
| author | Greg Kroah-Hartman | 2019-07-05 07:19:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-05 07:19:28 +0200 |
| commit | 2bc8bb813cba6e699b29fd0b30720288866a5e5d (patch) | |
| tree | c18bfc71a79b62666687ed402655a69a19a8ccf1 /drivers/usb/chipidea/core.c | |
| parent | Revert "usb: gadget: storage: Remove warning message" (diff) | |
| parent | usb: chipidea: msm: Use devm_platform_ioremap_resource() (diff) | |
| download | kernel-qcow2-linux-2bc8bb813cba6e699b29fd0b30720288866a5e5d.tar.gz kernel-qcow2-linux-2bc8bb813cba6e699b29fd0b30720288866a5e5d.tar.xz kernel-qcow2-linux-2bc8bb813cba6e699b29fd0b30720288866a5e5d.zip | |
Merge tag 'usb-ci-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
- Add imx7ulp support.
- Some tiny improvements, no function change.
* tag 'usb-ci-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
usb: chipidea: msm: Use devm_platform_ioremap_resource()
usb: chipidea: imx: Use devm_platform_ioremap_resource()
usb: chipidea: Use dev_err() instead of pr_err()
usb: chipidea: imx: "fsl,usbphy" phandle is not mandatory now
usb: chipidea: imx: add imx7ulp support
Diffstat (limited to 'drivers/usb/chipidea/core.c')
| -rw-r--r-- | drivers/usb/chipidea/core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 27749ace2d93..26062d610c20 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c @@ -523,8 +523,9 @@ int hw_device_reset(struct ci_hdrc *ci) hw_write(ci, OP_USBMODE, USBMODE_SLOM, USBMODE_SLOM); if (hw_read(ci, OP_USBMODE, USBMODE_CM) != USBMODE_CM_DC) { - pr_err("cannot enter in %s device mode", ci_role(ci)->name); - pr_err("lpm = %i", ci->hw_bank.lpm); + dev_err(ci->dev, "cannot enter in %s device mode\n", + ci_role(ci)->name); + dev_err(ci->dev, "lpm = %i\n", ci->hw_bank.lpm); return -ENODEV; } |