Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB: VIDEO: ivtvfb, remove unneeded NULL test

Stanse found that in ivtvfb_callback_cleanup and ivtvfb_callback_init
there are unneeded tests for itv being NULL. But itv is initialized
as container_of with non-zero offset in those functions, so it is
never NULL (even if v4l2_dev is). This was found because itv is
dereferenced earlier than the test.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Reviewed-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Jiri Slaby and committed by
Mauro Carvalho Chehab
37b58bfe 6efb870a

+2 -2
+2 -2
drivers/media/video/ivtv/ivtvfb.c
··· 1239 1239 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); 1240 1240 struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); 1241 1241 1242 - if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { 1242 + if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { 1243 1243 if (ivtvfb_init_card(itv) == 0) { 1244 1244 IVTVFB_INFO("Framebuffer registered on %s\n", 1245 1245 itv->v4l2_dev.name); ··· 1255 1255 struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); 1256 1256 struct osd_info *oi = itv->osd_info; 1257 1257 1258 - if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { 1258 + if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { 1259 1259 if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) { 1260 1260 IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n", 1261 1261 itv->instance);