diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 19:13:54 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-01 19:13:54 -0500 |
| commit | 71e41bbb43794e0fe4ce3b766d713e222ccfb5ea (patch) | |
| tree | 440f95dec8ac8fab4d817d76fe2714bbf1dedfe5 /drivers/usb/chipidea | |
| parent | a057c3259ab6ecab477379d23e27ea0afdb219e6 (diff) | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
Merge 4.5-rc6 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/chipidea')
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c b/drivers/usb/chipidea/ci_hdrc_pci.c index b59195edf636..b635ab67490d 100644 --- a/drivers/usb/chipidea/ci_hdrc_pci.c +++ b/drivers/usb/chipidea/ci_hdrc_pci.c | |||
| @@ -85,8 +85,8 @@ static int ci_hdrc_pci_probe(struct pci_dev *pdev, | |||
| 85 | 85 | ||
| 86 | /* register a nop PHY */ | 86 | /* register a nop PHY */ |
| 87 | ci->phy = usb_phy_generic_register(); | 87 | ci->phy = usb_phy_generic_register(); |
| 88 | if (!ci->phy) | 88 | if (IS_ERR(ci->phy)) |
| 89 | return -ENOMEM; | 89 | return PTR_ERR(ci->phy); |
| 90 | 90 | ||
| 91 | memset(res, 0, sizeof(res)); | 91 | memset(res, 0, sizeof(res)); |
| 92 | res[0].start = pci_resource_start(pdev, 0); | 92 | res[0].start = pci_resource_start(pdev, 0); |