summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>2008-06-13 09:03:45 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-26 15:58:50 -0300
commit02da465945ae0a277aadf2bf37965a9e6c28f8c3 (patch)
treefc262b379d5ca2fc448d74606cbbe40354a72b09 /drivers/media
parent7ae1ac4c1db5a3647604acb00d736f17af6999b7 (diff)
downloadlinux-3.10-02da465945ae0a277aadf2bf37965a9e6c28f8c3.tar.gz
linux-3.10-02da465945ae0a277aadf2bf37965a9e6c28f8c3.tar.bz2
linux-3.10-02da465945ae0a277aadf2bf37965a9e6c28f8c3.zip
V4L/DVB (8039): pxa-camera: fix platform_get_irq() error handling.
platform_get_irq() returns a negative value on error, not 0. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/pxa_camera.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 7cc8e9b19fb..5ec5bb9a94d 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -1019,12 +1019,12 @@ static int pxa_camera_probe(struct platform_device *pdev)
struct pxa_camera_dev *pcdev;
struct resource *res;
void __iomem *base;
- unsigned int irq;
+ int irq;
int err = 0;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (!res || !irq) {
+ if (!res || irq < 0) {
err = -ENODEV;
goto exit;
}