Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/usb/chipidea/ci_hdrc_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/usb/chipidea/debug.c

+3 −0
Original line number Diff line number Diff line
@@ -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);