From fad68248fec275a24f4e7ce42ef75b5513f2f177 Mon Sep 17 00:00:00 2001 From: Nickolai Zeldovich Date: Sun, 6 Jan 2013 21:52:03 -0300 Subject: [PATCH] --- yaml --- r: 357468 b: refs/heads/master c: a46edeb0f6098088f316c3543474784f8108508e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/cx18/cx18-i2c.c | 3 --- trunk/drivers/media/pci/ivtv/ivtv-i2c.c | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 875c834da64b..7241136eee16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e20f6bfc47992d93b36f4ed068782f8726b75a3 +refs/heads/master: a46edeb0f6098088f316c3543474784f8108508e diff --git a/trunk/drivers/media/pci/cx18/cx18-i2c.c b/trunk/drivers/media/pci/cx18/cx18-i2c.c index d61ac6393e7e..4af8cd6df95d 100644 --- a/trunk/drivers/media/pci/cx18/cx18-i2c.c +++ b/trunk/drivers/media/pci/cx18/cx18-i2c.c @@ -116,9 +116,6 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx) const char *type = hw_devicenames[idx]; u32 hw = 1 << idx; - if (idx >= ARRAY_SIZE(hw_addrs)) - return -1; - if (hw == CX18_HW_TUNER) { /* special tuner group handling */ sd = v4l2_i2c_new_subdev(&cx->v4l2_dev, diff --git a/trunk/drivers/media/pci/ivtv/ivtv-i2c.c b/trunk/drivers/media/pci/ivtv/ivtv-i2c.c index a1811054fde4..ceed2d87abfd 100644 --- a/trunk/drivers/media/pci/ivtv/ivtv-i2c.c +++ b/trunk/drivers/media/pci/ivtv/ivtv-i2c.c @@ -267,8 +267,6 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx) const char *type = hw_devicenames[idx]; u32 hw = 1 << idx; - if (idx >= ARRAY_SIZE(hw_addrs)) - return -1; if (hw == IVTV_HW_TUNER) { /* special tuner handling */ sd = v4l2_i2c_new_subdev(&itv->v4l2_dev, adap, type, 0,