From 24e2bcf645cbb8324fa58ba1988938b452782422 Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Thu, 17 May 2012 20:09:53 +0900 Subject: [PATCH] --- yaml --- r: 303980 b: refs/heads/master c: da020b49fa6ee7eaf9fe359bc6089dd1848bb7d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/otg/gpio_vbus.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 235e24f75401..8336ca56d173 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 123bbceebeb1174e385eab1fc2b2535dcdcc9ec3 +refs/heads/master: da020b49fa6ee7eaf9fe359bc6089dd1848bb7d0 diff --git a/trunk/drivers/usb/otg/gpio_vbus.c b/trunk/drivers/usb/otg/gpio_vbus.c index 8853cb1fd9d7..4e393ef2f254 100644 --- a/trunk/drivers/usb/otg/gpio_vbus.c +++ b/trunk/drivers/usb/otg/gpio_vbus.c @@ -53,8 +53,7 @@ struct gpio_vbus_data { * edges might be workable. */ #define VBUS_IRQ_FLAGS \ - ( IRQF_SAMPLE_RANDOM | IRQF_SHARED \ - | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING ) + (IRQF_SHARED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING) /* interface to regulator framework */ @@ -280,7 +279,7 @@ static int __init gpio_vbus_probe(struct platform_device *pdev) if (res) { irq = res->start; res->flags &= IRQF_TRIGGER_MASK; - res->flags |= IRQF_SAMPLE_RANDOM | IRQF_SHARED; + res->flags |= IRQF_SHARED; } else irq = gpio_to_irq(gpio);