The patch number 13942 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
linux/drivers/media/video/mx1_camera.c | 2 +-
linux/drivers/media/video/rj54n1cb0c.c | 2 +-
linux/drivers/media/video/sh_mobile_ceu_camera.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -r 9f2b96a560c1 -r d490d84a64ac linux/drivers/media/video/mx1_camera.c
--- a/linux/drivers/media/video/mx1_camera.c Wed Jan 13 12:08:13 2010 -0200
+++ b/linux/drivers/media/video/mx1_camera.c Wed Jan 13 12:11:34 2010 -0200
@@ -718,7 +718,7 @@
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;
}
diff -r 9f2b96a560c1 -r d490d84a64ac linux/drivers/media/video/rj54n1cb0c.c
--- a/linux/drivers/media/video/rj54n1cb0c.c Wed Jan 13 12:08:13 2010 -0200
+++ b/linux/drivers/media/video/rj54n1cb0c.c Wed Jan 13 12:11:34 2010 -0200
@@ -563,7 +563,7 @@
struct i2c_client *client = sd->priv;
struct rj54n1 *rj54n1 = to_rj54n1(client);
struct v4l2_rect *rect = &a->c;
- unsigned int dummy, output_w, output_h,
+ unsigned int dummy = 0, output_w, output_h,
input_w = rect->width, input_h = rect->height;
int ret;
diff -r 9f2b96a560c1 -r d490d84a64ac
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Wed Jan 13 12:08:13
2010 -0200
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Wed Jan 13 12:11:34
2010 -0200
@@ -1828,7 +1828,7 @@
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (!res || !irq) {
+ if (!res || (int)irq <= 0) {
dev_err(&pdev->dev, "Not enough CEU platform resources.\n");
err = -ENODEV;
goto exit;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d490d84a64ac0b33bc942707c81e5c5e3b40c30c
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
