From 50ff952ce60efbc24e2f542b2428f419c3132ded Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Mon, 28 Dec 2009 13:02:48 +0200 Subject: [PATCH] --- yaml --- r: 185281 b: refs/heads/master c: 8f20960cd772fe42a9cdd36312b2247bc2800ffb h: refs/heads/master i: 185279: 40ad4ac408536081e8545e5ee6c9d8be4a4f572e v: v3 --- [refs] | 2 +- trunk/drivers/usb/otg/twl4030-usb.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 7cf9c7975f2a..fd85624c6c64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c9188ad25dde86e929bd567166b5a1366a3a9059 +refs/heads/master: 8f20960cd772fe42a9cdd36312b2247bc2800ffb diff --git a/trunk/drivers/usb/otg/twl4030-usb.c b/trunk/drivers/usb/otg/twl4030-usb.c index 34452d95b386..3e4e9f434d78 100644 --- a/trunk/drivers/usb/otg/twl4030-usb.c +++ b/trunk/drivers/usb/otg/twl4030-usb.c @@ -567,14 +567,6 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl) struct twl4030_usb *twl = _twl; int status; -#ifdef CONFIG_LOCKDEP - /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which - * we don't want and can't tolerate. Although it might be - * friendlier not to borrow this thread context... - */ - local_irq_enable(); -#endif - status = twl4030_usb_linkstat(twl); if (status >= 0) { /* FIXME add a set_power() method so that B-devices can @@ -695,7 +687,7 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev) * need both handles, otherwise just one suffices. */ twl->irq_enabled = true; - status = request_irq(twl->irq, twl4030_usb_irq, + status = request_threaded_irq(twl->irq, NULL, twl4030_usb_irq, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "twl4030_usb", twl); if (status < 0) {