Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364685
b: refs/heads/master
c: 25df639
h: refs/heads/master
i:
  364683: 0a76e69
v: v3
  • Loading branch information
Sascha Hauer authored and Felipe Balbi committed Mar 18, 2013
1 parent 190d201 commit 1e1e71c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cedf8602373a3a5d02e49af7bebc401ffe3b38f3
refs/heads/master: 25df6397a6c063811154868b868e8bd10e5ae9b1
9 changes: 9 additions & 0 deletions trunk/drivers/usb/otg/mxs-phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ static int mxs_phy_probe(struct platform_device *pdev)
void __iomem *base;
struct clk *clk;
struct mxs_phy *mxs_phy;
int ret;

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
Expand Down Expand Up @@ -166,11 +167,19 @@ static int mxs_phy_probe(struct platform_device *pdev)

platform_set_drvdata(pdev, &mxs_phy->phy);

ret = usb_add_phy_dev(&mxs_phy->phy);
if (ret)
return ret;

return 0;
}

static int mxs_phy_remove(struct platform_device *pdev)
{
struct mxs_phy *mxs_phy = platform_get_drvdata(pdev);

usb_remove_phy(&mxs_phy->phy);

platform_set_drvdata(pdev, NULL);

return 0;
Expand Down

0 comments on commit 1e1e71c

Please sign in to comment.