Skip to content

Commit

Permalink
usb: host: ehci-s5p: fix PHY error handling
Browse files Browse the repository at this point in the history
PHY layer no longer returns NULL. We must
switch from IS_ERR_OR_NULL() to IS_ERR().

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Mar 18, 2013
1 parent 6f3ed4e commit a16283e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/host/ehci-s5p.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
return -ENOMEM;

phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
if (IS_ERR_OR_NULL(phy)) {
if (IS_ERR(phy)) {
/* Fallback to pdata */
if (!pdata) {
dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
Expand Down

0 comments on commit a16283e

Please sign in to comment.