| From 16032edc499df9af1f03bba47328abff8e914da5 Mon Sep 17 00:00:00 2001 |
| From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
| Date: Mon, 20 Sep 2010 18:31:07 +0200 |
| Subject: [PATCH] USB: atmel_usba_udc: force vbus_pin at -EINVAL when gpio_request failled |
| |
| commit 969affff54702785330de553b790372e261e93f9 upstream. |
| |
| to ensure gpio_is_valid return false |
| |
| Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> |
| Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| drivers/usb/gadget/atmel_usba_udc.c | 3 +++ |
| 1 files changed, 3 insertions(+), 0 deletions(-) |
| |
| diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c |
| index 75a256f..8fd88e1 100644 |
| --- a/drivers/usb/gadget/atmel_usba_udc.c |
| +++ b/drivers/usb/gadget/atmel_usba_udc.c |
| @@ -2015,6 +2015,9 @@ static int __init usba_udc_probe(struct platform_device *pdev) |
| } else { |
| disable_irq(gpio_to_irq(udc->vbus_pin)); |
| } |
| + } else { |
| + /* gpio_request fail so use -EINVAL for gpio_is_valid */ |
| + ubc->vbus_pin = -EINVAL; |
| } |
| } |
| |
| -- |
| 1.7.0.4 |
| |
