From 613b379d60899c6ee86af55d41288f4801c4dba8 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Fri, 13 Jun 2008 09:03:45 -0300 Subject: [PATCH] --- yaml --- r: 98491 b: refs/heads/master c: 02da465945ae0a277aadf2bf37965a9e6c28f8c3 h: refs/heads/master i: 98489: 60a6270782b9caff89e5effea8704517ebe8c532 98487: 0f260fe3578117b54311bdfdcec2b0a1d5a790c4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pxa_camera.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1531c8f15a61..d51724ce1a31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ae1ac4c1db5a3647604acb00d736f17af6999b7 +refs/heads/master: 02da465945ae0a277aadf2bf37965a9e6c28f8c3 diff --git a/trunk/drivers/media/video/pxa_camera.c b/trunk/drivers/media/video/pxa_camera.c index 7cc8e9b19fb7..5ec5bb9a94d2 100644 --- a/trunk/drivers/media/video/pxa_camera.c +++ b/trunk/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; }