diff options
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index f7ff9e8e746a..c319814ad120 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
| @@ -2200,19 +2200,15 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev) | |||
| 2200 | 2200 | ||
| 2201 | #ifdef CONFIG_ARCH_LUBBOCK | 2201 | #ifdef CONFIG_ARCH_LUBBOCK |
| 2202 | if (machine_is_lubbock()) { | 2202 | if (machine_is_lubbock()) { |
| 2203 | retval = request_irq(LUBBOCK_USB_DISC_IRQ, | 2203 | retval = request_irq(LUBBOCK_USB_DISC_IRQ, lubbock_vbus_irq, |
| 2204 | lubbock_vbus_irq, | 2204 | 0, driver_name, dev); |
| 2205 | IRQF_SAMPLE_RANDOM, | ||
| 2206 | driver_name, dev); | ||
| 2207 | if (retval != 0) { | 2205 | if (retval != 0) { |
| 2208 | pr_err("%s: can't get irq %i, err %d\n", | 2206 | pr_err("%s: can't get irq %i, err %d\n", |
| 2209 | driver_name, LUBBOCK_USB_DISC_IRQ, retval); | 2207 | driver_name, LUBBOCK_USB_DISC_IRQ, retval); |
| 2210 | goto err_irq_lub; | 2208 | goto err_irq_lub; |
| 2211 | } | 2209 | } |
| 2212 | retval = request_irq(LUBBOCK_USB_IRQ, | 2210 | retval = request_irq(LUBBOCK_USB_IRQ, lubbock_vbus_irq, |
| 2213 | lubbock_vbus_irq, | 2211 | 0, driver_name, dev); |
| 2214 | IRQF_SAMPLE_RANDOM, | ||
| 2215 | driver_name, dev); | ||
| 2216 | if (retval != 0) { | 2212 | if (retval != 0) { |
| 2217 | pr_err("%s: can't get irq %i, err %d\n", | 2213 | pr_err("%s: can't get irq %i, err %d\n", |
| 2218 | driver_name, LUBBOCK_USB_IRQ, retval); | 2214 | driver_name, LUBBOCK_USB_IRQ, retval); |