diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
| commit | dba861461f88c12249ac78fb877866c04f99deb3 (patch) | |
| tree | 5812b143581bcc66c7c542f01ba0cb22e489b8e5 /drivers/usb/phy/phy-am335x.c | |
| parent | 0e6601eee039893a3f6420596ae4588d90d13cbe (diff) | |
| parent | 228fdc083b017eaf90e578fa86fb1ecfd5ffae87 (diff) | |
Merge branch 'linus' into timers/core
Pick up the latest fixes and refresh the branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/usb/phy/phy-am335x.c')
| -rw-r--r-- | drivers/usb/phy/phy-am335x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/phy/phy-am335x.c b/drivers/usb/phy/phy-am335x.c index 6370e50649d7..0e3c60cb669a 100644 --- a/drivers/usb/phy/phy-am335x.c +++ b/drivers/usb/phy/phy-am335x.c | |||
| @@ -52,8 +52,7 @@ static int am335x_phy_probe(struct platform_device *pdev) | |||
| 52 | return am_phy->id; | 52 | return am_phy->id; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | ret = usb_phy_gen_create_phy(dev, &am_phy->usb_phy_gen, | 55 | ret = usb_phy_gen_create_phy(dev, &am_phy->usb_phy_gen, NULL); |
| 56 | USB_PHY_TYPE_USB2, 0, false); | ||
| 57 | if (ret) | 56 | if (ret) |
| 58 | return ret; | 57 | return ret; |
| 59 | 58 | ||
| @@ -66,8 +65,6 @@ static int am335x_phy_probe(struct platform_device *pdev) | |||
| 66 | platform_set_drvdata(pdev, am_phy); | 65 | platform_set_drvdata(pdev, am_phy); |
| 67 | 66 | ||
| 68 | return 0; | 67 | return 0; |
| 69 | |||
| 70 | return ret; | ||
| 71 | } | 68 | } |
| 72 | 69 | ||
| 73 | static int am335x_phy_remove(struct platform_device *pdev) | 70 | static int am335x_phy_remove(struct platform_device *pdev) |