diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/musb/ux500_dma.c | 6 | ||||
| -rw-r--r-- | drivers/usb/phy/phy-ab8500-usb.c | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index 338120641145..63e7c8a6b125 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c | |||
| @@ -71,8 +71,7 @@ static void ux500_dma_callback(void *private_data) | |||
| 71 | spin_lock_irqsave(&musb->lock, flags); | 71 | spin_lock_irqsave(&musb->lock, flags); |
| 72 | ux500_channel->channel.actual_len = ux500_channel->cur_len; | 72 | ux500_channel->channel.actual_len = ux500_channel->cur_len; |
| 73 | ux500_channel->channel.status = MUSB_DMA_STATUS_FREE; | 73 | ux500_channel->channel.status = MUSB_DMA_STATUS_FREE; |
| 74 | musb_dma_completion(musb, hw_ep->epnum, | 74 | musb_dma_completion(musb, hw_ep->epnum, ux500_channel->is_tx); |
| 75 | ux500_channel->is_tx); | ||
| 76 | spin_unlock_irqrestore(&musb->lock, flags); | 75 | spin_unlock_irqrestore(&musb->lock, flags); |
| 77 | 76 | ||
| 78 | } | 77 | } |
| @@ -366,7 +365,8 @@ void dma_controller_destroy(struct dma_controller *c) | |||
| 366 | kfree(controller); | 365 | kfree(controller); |
| 367 | } | 366 | } |
| 368 | 367 | ||
| 369 | struct dma_controller *dma_controller_create(struct musb *musb, void __iomem *base) | 368 | struct dma_controller *dma_controller_create(struct musb *musb, |
| 369 | void __iomem *base) | ||
| 370 | { | 370 | { |
| 371 | struct ux500_dma_controller *controller; | 371 | struct ux500_dma_controller *controller; |
| 372 | struct platform_device *pdev = to_platform_device(musb->controller); | 372 | struct platform_device *pdev = to_platform_device(musb->controller); |
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c index e5eb1b5a04eb..f760e935e059 100644 --- a/drivers/usb/phy/phy-ab8500-usb.c +++ b/drivers/usb/phy/phy-ab8500-usb.c | |||
| @@ -286,7 +286,8 @@ static void ab8500_usb_phy_disable(struct ab8500_usb *ab, bool sel_host) | |||
| 286 | else if (pinctrl_select_state(ab->pinctrl, ab->pins_sleep)) | 286 | else if (pinctrl_select_state(ab->pinctrl, ab->pins_sleep)) |
| 287 | dev_err(ab->dev, "could not set pins to sleep state\n"); | 287 | dev_err(ab->dev, "could not set pins to sleep state\n"); |
| 288 | 288 | ||
| 289 | /* as USB pins are shared with idddet, release them to allow | 289 | /* |
| 290 | * as USB pins are shared with iddet, release them to allow | ||
| 290 | * iddet to request them | 291 | * iddet to request them |
| 291 | */ | 292 | */ |
| 292 | pinctrl_put(ab->pinctrl); | 293 | pinctrl_put(ab->pinctrl); |
| @@ -553,7 +554,7 @@ static irqreturn_t ab8500_usb_disconnect_irq(int irq, void *data) | |||
| 553 | 554 | ||
| 554 | static irqreturn_t ab8500_usb_link_status_irq(int irq, void *data) | 555 | static irqreturn_t ab8500_usb_link_status_irq(int irq, void *data) |
| 555 | { | 556 | { |
| 556 | struct ab8500_usb *ab = (struct ab8500_usb *) data; | 557 | struct ab8500_usb *ab = (struct ab8500_usb *)data; |
| 557 | 558 | ||
| 558 | abx500_usb_link_status_update(ab); | 559 | abx500_usb_link_status_update(ab); |
| 559 | 560 | ||
| @@ -627,7 +628,7 @@ static int ab8500_usb_set_peripheral(struct usb_otg *otg, | |||
| 627 | * is fixed. | 628 | * is fixed. |
| 628 | */ | 629 | */ |
| 629 | 630 | ||
| 630 | if ((ab->mode != USB_IDLE) && (!gadget)) { | 631 | if ((ab->mode != USB_IDLE) && !gadget) { |
| 631 | ab->mode = USB_IDLE; | 632 | ab->mode = USB_IDLE; |
| 632 | schedule_work(&ab->phy_dis_work); | 633 | schedule_work(&ab->phy_dis_work); |
| 633 | } | 634 | } |
| @@ -651,7 +652,7 @@ static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host) | |||
| 651 | * is fixed. | 652 | * is fixed. |
| 652 | */ | 653 | */ |
| 653 | 654 | ||
| 654 | if ((ab->mode != USB_IDLE) && (!host)) { | 655 | if ((ab->mode != USB_IDLE) && !host) { |
| 655 | ab->mode = USB_IDLE; | 656 | ab->mode = USB_IDLE; |
| 656 | schedule_work(&ab->phy_dis_work); | 657 | schedule_work(&ab->phy_dis_work); |
| 657 | } | 658 | } |
