UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: gadget/at91_udc: add gpio_to_irq() function to vbus interrupt 

Now that we are using irqdomains, we need to convert GPIO pins to Linux
IRQ numbers using the gpio_to_irq() function.
This call is added to request/free_irq calls.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Cc: linux-usb@vger.kernel.org
This commit is contained in:
Nicolas Ferre 2012-04-16 10:58:12 +02:00
parent b548a27b2e
commit 70756027b0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/gadget/at91_udc.c
View File

@ -1863,8 +1863,8 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
mod_timer(&udc->vbus_timer, mod_timer(&udc->vbus_timer,
jiffies + VBUS_POLL_TIMEOUT); jiffies + VBUS_POLL_TIMEOUT);
} else { } else {
if (request_irq(udc->board.vbus_pin, at91_vbus_irq, if (request_irq(gpio_to_irq(udc->board.vbus_pin),
0, driver_name, udc)) { at91_vbus_irq, 0, driver_name, udc)) {
DBG("request vbus irq %d failed\n", DBG("request vbus irq %d failed\n",
udc->board.vbus_pin); udc->board.vbus_pin);
retval = -EBUSY; retval = -EBUSY;
@ -1886,7 +1886,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
return 0; return 0;
fail4: fail4:
if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled) if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled)
free_irq(udc->board.vbus_pin, udc); free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
fail3: fail3:
if (gpio_is_valid(udc->board.vbus_pin)) if (gpio_is_valid(udc->board.vbus_pin))
gpio_free(udc->board.vbus_pin); gpio_free(udc->board.vbus_pin);
@ -1924,7 +1924,7 @@ static int __exit at91udc_remove(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, 0); device_init_wakeup(&pdev->dev, 0);
remove_debug_file(udc); remove_debug_file(udc);
if (gpio_is_valid(udc->board.vbus_pin)) { if (gpio_is_valid(udc->board.vbus_pin)) {
free_irq(udc->board.vbus_pin, udc); free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
gpio_free(udc->board.vbus_pin); gpio_free(udc->board.vbus_pin);
} }
free_irq(udc->udp_irq, udc); free_irq(udc->udp_irq, udc);