Commit 3c7dc6a0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'usb-ci-v4.5-rc5' of...

Merge tag 'usb-ci-v4.5-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-linus

Peter writes:

Some tiny bug fixes for chipidea driver
parents 18558cae 8c0614ca
...@@ -85,8 +85,8 @@ static int ci_hdrc_pci_probe(struct pci_dev *pdev, ...@@ -85,8 +85,8 @@ static int ci_hdrc_pci_probe(struct pci_dev *pdev,
/* register a nop PHY */ /* register a nop PHY */
ci->phy = usb_phy_generic_register(); ci->phy = usb_phy_generic_register();
if (!ci->phy) if (IS_ERR(ci->phy))
return -ENOMEM; return PTR_ERR(ci->phy);
memset(res, 0, sizeof(res)); memset(res, 0, sizeof(res));
res[0].start = pci_resource_start(pdev, 0); res[0].start = pci_resource_start(pdev, 0);
......
...@@ -100,6 +100,9 @@ static ssize_t ci_port_test_write(struct file *file, const char __user *ubuf, ...@@ -100,6 +100,9 @@ static ssize_t ci_port_test_write(struct file *file, const char __user *ubuf,
if (sscanf(buf, "%u", &mode) != 1) if (sscanf(buf, "%u", &mode) != 1)
return -EINVAL; return -EINVAL;
if (mode > 255)
return -EBADRQC;
pm_runtime_get_sync(ci->dev); pm_runtime_get_sync(ci->dev);
spin_lock_irqsave(&ci->lock, flags); spin_lock_irqsave(&ci->lock, flags);
ret = hw_port_test_set(ci, mode); ret = hw_port_test_set(ci, mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment