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
This commit is contained in:
@@ -85,8 +85,8 @@ static int ci_hdrc_pci_probe(struct pci_dev *pdev,
|
||||
|
||||
/* register a nop PHY */
|
||||
ci->phy = usb_phy_generic_register();
|
||||
if (!ci->phy)
|
||||
return -ENOMEM;
|
||||
if (IS_ERR(ci->phy))
|
||||
return PTR_ERR(ci->phy);
|
||||
|
||||
memset(res, 0, sizeof(res));
|
||||
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,
|
||||
if (sscanf(buf, "%u", &mode) != 1)
|
||||
return -EINVAL;
|
||||
|
||||
if (mode > 255)
|
||||
return -EBADRQC;
|
||||
|
||||
pm_runtime_get_sync(ci->dev);
|
||||
spin_lock_irqsave(&ci->lock, flags);
|
||||
ret = hw_port_test_set(ci, mode);
|
||||
|
||||
Reference in New Issue
Block a user