aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2010-01-09 20:44:06 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 11:31:37 -0200
commit30883ea8f2b489ccbb6aa0755832218ec45468a1 (patch)
tree15cb9d6adce4421cd8e420944ecb99fc6d5d3b50
parent3f76cf8c8ed10da1ce50f821366d0dc590397069 (diff)
downloadkernel_samsung_smdk4412-30883ea8f2b489ccbb6aa0755832218ec45468a1.tar.gz
kernel_samsung_smdk4412-30883ea8f2b489ccbb6aa0755832218ec45468a1.tar.bz2
kernel_samsung_smdk4412-30883ea8f2b489ccbb6aa0755832218ec45468a1.zip
V4L/DVB mx1_camera: don't check platform_get_irq's return value against zero
platform_get_irq returns -ENXIO on failure, so !irq was probably always true. Better use (int)irq <= 0. Note that a return value of zero is still handled as error even though this could mean irq0. This is a followup to 305b3228f9ff4d59f49e6d34a7034d44ee8ce2f0 that changed the return value of platform_get_irq from 0 to -ENXIO on error. Cc: David Vrabel <dvrabel@arcom.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Cc: Antonio Ospite <ospite@studenti.unina.it> Cc: Paulius Zaleckas <paulius.zaleckas@teltonika.lt> Cc: linux-media@vger.kernel.org Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/mx1_camera.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 2ba14fb5b03..c167cc3de49 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -718,7 +718,7 @@ static int __init mx1_camera_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (!res || !irq) {
+ if (!res || (int)irq <= 0) {
err = -ENODEV;
goto exit;
}