From 965923d9cddf7ec5afe7fa531a682c6513287024 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Thu, 28 Apr 2011 09:34:32 -0700 Subject: [PATCH] --- yaml --- r: 250500 b: refs/heads/master c: 2dfb9a85ecb86f00b085d6fca7d4bb8dc6764710 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/sh_keysc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a80634b0f2e7..d93c9b7bf373 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6d2a3e6ff6a7019b4a240b6bc4a4d74ce82d533 +refs/heads/master: 2dfb9a85ecb86f00b085d6fca7d4bb8dc6764710 diff --git a/trunk/drivers/input/keyboard/sh_keysc.c b/trunk/drivers/input/keyboard/sh_keysc.c index 429ac2b77438..66eea50fccf5 100644 --- a/trunk/drivers/input/keyboard/sh_keysc.c +++ b/trunk/drivers/input/keyboard/sh_keysc.c @@ -231,7 +231,8 @@ static int __devinit sh_keysc_probe(struct platform_device *pdev) input->keycodesize = sizeof(pdata->keycodes[0]); input->keycodemax = ARRAY_SIZE(pdata->keycodes); - error = request_irq(irq, sh_keysc_isr, 0, pdev->name, pdev); + error = request_threaded_irq(irq, NULL, sh_keysc_isr, IRQF_ONESHOT, + dev_name(&pdev->dev), pdev); if (error) { dev_err(&pdev->dev, "failed to request IRQ\n"); goto err3;