diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-15 08:39:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-15 08:39:37 -0300 |
| commit | 4342396d067393d31b3ec38a9d0e00ffb0286c30 (patch) | |
| tree | 2a918e16624567e8df54c7ca849317c54933a6de /linux/drivers/media/video/pxa_camera.c | |
| parent | 5948bab2516e721360e6db06be74da5fe69dfe3f (diff) | |
| parent | 218eafef6b0f3f2eac0db3fd932b534ed760658d (diff) | |
| download | mediapointer-dvb-s2-4342396d067393d31b3ec38a9d0e00ffb0286c30.tar.gz mediapointer-dvb-s2-4342396d067393d31b3ec38a9d0e00ffb0286c30.tar.bz2 | |
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pxa_camera.c')
| -rw-r--r-- | linux/drivers/media/video/pxa_camera.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c index 7cc8e9b19..5ec5bb9a9 100644 --- a/linux/drivers/media/video/pxa_camera.c +++ b/linux/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; } |