diff options
Diffstat (limited to 'drivers/usb/gadget/omap_udc.c')
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 0d642ac70055..2de9748ee673 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -772,7 +772,7 @@ static void dma_error(int lch, u16 ch_status, void *data) | |||
772 | struct omap_ep *ep = data; | 772 | struct omap_ep *ep = data; |
773 | 773 | ||
774 | /* if ch_status & OMAP_DMA_DROP_IRQ ... */ | 774 | /* if ch_status & OMAP_DMA_DROP_IRQ ... */ |
775 | /* if ch_status & OMAP_DMA_TOUT_IRQ ... */ | 775 | /* if ch_status & OMAP1_DMA_TOUT_IRQ ... */ |
776 | ERR("%s dma error, lch %d status %02x\n", ep->ep.name, lch, ch_status); | 776 | ERR("%s dma error, lch %d status %02x\n", ep->ep.name, lch, ch_status); |
777 | 777 | ||
778 | /* complete current transfer ... */ | 778 | /* complete current transfer ... */ |
@@ -2818,7 +2818,7 @@ bad_on_1710: | |||
2818 | 2818 | ||
2819 | /* USB general purpose IRQ: ep0, state changes, dma, etc */ | 2819 | /* USB general purpose IRQ: ep0, state changes, dma, etc */ |
2820 | status = request_irq(pdev->resource[1].start, omap_udc_irq, | 2820 | status = request_irq(pdev->resource[1].start, omap_udc_irq, |
2821 | SA_SAMPLE_RANDOM, driver_name, udc); | 2821 | IRQF_SAMPLE_RANDOM, driver_name, udc); |
2822 | if (status != 0) { | 2822 | if (status != 0) { |
2823 | ERR( "can't get irq %ld, err %d\n", | 2823 | ERR( "can't get irq %ld, err %d\n", |
2824 | pdev->resource[1].start, status); | 2824 | pdev->resource[1].start, status); |
@@ -2827,7 +2827,7 @@ bad_on_1710: | |||
2827 | 2827 | ||
2828 | /* USB "non-iso" IRQ (PIO for all but ep0) */ | 2828 | /* USB "non-iso" IRQ (PIO for all but ep0) */ |
2829 | status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, | 2829 | status = request_irq(pdev->resource[2].start, omap_udc_pio_irq, |
2830 | SA_SAMPLE_RANDOM, "omap_udc pio", udc); | 2830 | IRQF_SAMPLE_RANDOM, "omap_udc pio", udc); |
2831 | if (status != 0) { | 2831 | if (status != 0) { |
2832 | ERR( "can't get irq %ld, err %d\n", | 2832 | ERR( "can't get irq %ld, err %d\n", |
2833 | pdev->resource[2].start, status); | 2833 | pdev->resource[2].start, status); |
@@ -2835,7 +2835,7 @@ bad_on_1710: | |||
2835 | } | 2835 | } |
2836 | #ifdef USE_ISO | 2836 | #ifdef USE_ISO |
2837 | status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, | 2837 | status = request_irq(pdev->resource[3].start, omap_udc_iso_irq, |
2838 | SA_INTERRUPT, "omap_udc iso", udc); | 2838 | IRQF_DISABLED, "omap_udc iso", udc); |
2839 | if (status != 0) { | 2839 | if (status != 0) { |
2840 | ERR("can't get irq %ld, err %d\n", | 2840 | ERR("can't get irq %ld, err %d\n", |
2841 | pdev->resource[3].start, status); | 2841 | pdev->resource[3].start, status); |