lkml.org 
[lkml]   [2014]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] input: pcap2: avoid calling mutex_lock() in irq handler
Date
pcap_keys_handler() calls ezx_pcap_read() that calls mutex_lock().
pcap_keys_handler() is registered as nonthreaded irq handler,
that means sleeping function is called in irq handler.

The patch makes a switch to threaded irq handling.
Compile tested only.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
---
drivers/input/misc/pcap_keys.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/input/misc/pcap_keys.c b/drivers/input/misc/pcap_keys.c
index cd230365166e..2a10f3a30969 100644
--- a/drivers/input/misc/pcap_keys.c
+++ b/drivers/input/misc/pcap_keys.c
@@ -79,13 +79,15 @@ static int pcap_keys_probe(struct platform_device *pdev)
if (err)
goto fail_allocate;

- err = request_irq(pcap_to_irq(pcap_keys->pcap, PCAP_IRQ_ONOFF),
- pcap_keys_handler, 0, "Power key", pcap_keys);
+ err = request_threaded_irq(pcap_to_irq(pcap_keys->pcap, PCAP_IRQ_ONOFF),
+ NULL, pcap_keys_handler, 0,
+ "Power key", pcap_keys);
if (err)
goto fail_register;

- err = request_irq(pcap_to_irq(pcap_keys->pcap, PCAP_IRQ_MIC),
- pcap_keys_handler, 0, "Headphone button", pcap_keys);
+ err = request_threaded_irq(pcap_to_irq(pcap_keys->pcap, PCAP_IRQ_MIC),
+ NULL, pcap_keys_handler, 0,
+ "Headphone button", pcap_keys);
if (err)
goto fail_pwrkey;

--
1.8.3.2


\
 
 \ /
  Last update: 2014-04-05 23:22    [W:0.108 / U:0.516 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site