diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-08-25 00:40:16 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-09-25 00:17:24 +0200 |
| commit | f2ce39828abd556814366c2483191a7213c764f2 (patch) | |
| tree | 63666f06be2821c4a3f3e8604dad505ac4906421 /drivers | |
| parent | 58637c9b65300cbdf9fb7c037978daadd136be86 (diff) | |
| download | linux-stable-f2ce39828abd556814366c2483191a7213c764f2.tar.gz linux-stable-f2ce39828abd556814366c2483191a7213c764f2.tar.bz2 linux-stable-f2ce39828abd556814366c2483191a7213c764f2.zip | |
NFC: Set the IRQF_ONESHOT flag from the pn544_hci IRQ handler request
As we don't have a primary handler but only a threaded one, __setup_irq()
ends up failing if we don't set this flag.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nfc/pn544_hci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/pn544_hci.c b/drivers/nfc/pn544_hci.c index aa71807189ba..9458d53cdb59 100644 --- a/drivers/nfc/pn544_hci.c +++ b/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; |