]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: aspeed: change irq to threaded irq
authorJae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Fri, 31 May 2019 22:15:41 +0000 (18:15 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:12:30 +0000 (09:12 +0200)
[ Upstream commit 12ae1c1bf5db2f33fcd9092a96f630291c4b181a ]

Differently from other Aspeed drivers, this driver calls clock
control APIs in interrupt context. Since ECLK is coupled with a
reset bit in clk-aspeed module, aspeed_clk_enable will make 10ms of
busy waiting delay for triggering the reset and it will eventually
disturb other drivers' interrupt handling. To fix this issue, this
commit changes this driver's irq to threaded irq so that the delay
can be happened in a thread context.

Signed-off-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>
Reviewed-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/aspeed-video.c

index 692e08ef38c0e6598261c9975f7536ca013b7cba..668d8827e2811774d900b60728595e80d1a0a86e 100644 (file)
@@ -1600,8 +1600,9 @@ static int aspeed_video_init(struct aspeed_video *video)
                return -ENODEV;
        }
 
-       rc = devm_request_irq(dev, irq, aspeed_video_irq, IRQF_SHARED,
-                             DEVICE_NAME, video);
+       rc = devm_request_threaded_irq(dev, irq, NULL, aspeed_video_irq,
+                                      IRQF_ONESHOT | IRQF_SHARED, DEVICE_NAME,
+                                      video);
        if (rc < 0) {
                dev_err(dev, "Unable to request IRQ %d\n", irq);
                return rc;