From 956285fa548708351e35fd085244d2faaa3383e5 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Sat, 25 Aug 2012 00:40:16 +0200 Subject: [PATCH] --- yaml --- r: 328270 b: refs/heads/master c: f2ce39828abd556814366c2483191a7213c764f2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/nfc/pn544_hci.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index da9d105b4ac3..c22eacafd072 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58637c9b65300cbdf9fb7c037978daadd136be86 +refs/heads/master: f2ce39828abd556814366c2483191a7213c764f2 diff --git a/trunk/drivers/nfc/pn544_hci.c b/trunk/drivers/nfc/pn544_hci.c index aa71807189ba..9458d53cdb59 100644 --- a/trunk/drivers/nfc/pn544_hci.c +++ b/trunk/drivers/nfc/pn544_hci.c @@ -848,8 +848,8 @@ static int __devinit pn544_hci_probe(struct i2c_client *client, pn544_hci_platform_init(info); r = request_threaded_irq(client->irq, NULL, pn544_hci_irq_thread_fn, - IRQF_TRIGGER_RISING, PN544_HCI_DRIVER_NAME, - info); + IRQF_TRIGGER_RISING | IRQF_ONESHOT, + PN544_HCI_DRIVER_NAME, info); if (r < 0) { dev_err(&client->dev, "Unable to register IRQ handler\n"); goto err_rti;