From 054ed4c5aa03a72e47c3262ffd58f4002f83172b Mon Sep 17 00:00:00 2001 From: Yong Zhang Date: Fri, 21 Oct 2011 23:56:53 +0000 Subject: [PATCH] --- yaml --- r: 275349 b: refs/heads/master c: 6ea741a13690da9dbbac76175db8e313b0c4b817 h: refs/heads/master i: 275347: 4f436b5b6828f2b4a5f8063d503cffd6bc58544b v: v3 --- [refs] | 2 +- trunk/drivers/ps3/ps3-vuart.c | 2 +- trunk/drivers/ps3/ps3stor_lib.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 47f251cda522..8b4325c00a0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3a9f3b47d12b5f6dfc9c7ed9d7b193d77812195 +refs/heads/master: 6ea741a13690da9dbbac76175db8e313b0c4b817 diff --git a/trunk/drivers/ps3/ps3-vuart.c b/trunk/drivers/ps3/ps3-vuart.c index d9fb729535a1..fb7300837fee 100644 --- a/trunk/drivers/ps3/ps3-vuart.c +++ b/trunk/drivers/ps3/ps3-vuart.c @@ -952,7 +952,7 @@ static int ps3_vuart_bus_interrupt_get(void) } result = request_irq(vuart_bus_priv.virq, ps3_vuart_irq_handler, - IRQF_DISABLED, "vuart", &vuart_bus_priv); + 0, "vuart", &vuart_bus_priv); if (result) { pr_debug("%s:%d: request_irq failed (%d)\n", diff --git a/trunk/drivers/ps3/ps3stor_lib.c b/trunk/drivers/ps3/ps3stor_lib.c index cc328dec946b..8c3f5adf1bc6 100644 --- a/trunk/drivers/ps3/ps3stor_lib.c +++ b/trunk/drivers/ps3/ps3stor_lib.c @@ -167,7 +167,7 @@ int ps3stor_setup(struct ps3_storage_device *dev, irq_handler_t handler) goto fail_close_device; } - error = request_irq(dev->irq, handler, IRQF_DISABLED, + error = request_irq(dev->irq, handler, 0, dev->sbd.core.driver->name, dev); if (error) { dev_err(&dev->sbd.core, "%s:%u: request_irq failed %d\n",