diff options
| author | Ingo Molnar <[email protected]> | 2015-01-28 14:30:32 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-01-28 14:30:32 +0000 |
| commit | 41ca5d4e9be11ea6ae040b51d9628a189fd82896 (patch) | |
| tree | f9c35cc37b9622f6cccd91b94548f44b9a534029 /drivers/usb/phy/phy-mv-usb.c | |
| parent | x86_64 entry: Fix RCX for ptraced syscalls (diff) | |
| parent | x86, tls: Interpret an all-zero struct user_desc as "no segment" (diff) | |
| download | kernel-41ca5d4e9be11ea6ae040b51d9628a189fd82896.tar.gz kernel-41ca5d4e9be11ea6ae040b51d9628a189fd82896.zip | |
Merge commit 3669ef9fa7d3 ("x86, tls: Interpret an all-zero struct user_desc as 'no segment'") into x86/asm
Pick up the latestest asm fixes before advancing it any further.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/usb/phy/phy-mv-usb.c')
| -rw-r--r-- | drivers/usb/phy/phy-mv-usb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c index 699e38c73d82..697a741a0cb1 100644 --- a/drivers/usb/phy/phy-mv-usb.c +++ b/drivers/usb/phy/phy-mv-usb.c @@ -338,7 +338,6 @@ static void mv_otg_update_inputs(struct mv_otg *mvotg) static void mv_otg_update_state(struct mv_otg *mvotg) { struct mv_otg_ctrl *otg_ctrl = &mvotg->otg_ctrl; - struct usb_phy *phy = &mvotg->phy; int old_state = mvotg->phy.otg->state; switch (old_state) { @@ -858,10 +857,10 @@ static int mv_otg_suspend(struct platform_device *pdev, pm_message_t state) { struct mv_otg *mvotg = platform_get_drvdata(pdev); - if (mvotg->phy.state != OTG_STATE_B_IDLE) { + if (mvotg->phy.otg->state != OTG_STATE_B_IDLE) { dev_info(&pdev->dev, "OTG state is not B_IDLE, it is %d!\n", - mvotg->phy.state); + mvotg->phy.otg->state); return -EAGAIN; } |