Skip to content

Commit

Permalink
[media] media: cx18, ivtv: eliminate unnecessary array index checks
Browse files Browse the repository at this point in the history
The idx values passed to cx18_i2c_register() and ivtv_i2c_register()
by cx18_init_subdevs() and ivtv_load_and_init_modules() respectively
are always in-range, based on how the hw_all bitmask is populated.
Previously, the checks were already ineffective because arrays were
being dereferenced using the index before the check.

Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Nickolai Zeldovich authored and Mauro Carvalho Chehab committed Feb 5, 2013
1 parent 7e20f6b commit a46edeb
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions drivers/media/pci/cx18/cx18-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 0 additions & 2 deletions drivers/media/pci/ivtv/ivtv-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit a46edeb

Please sign in to comment.