diff options
author | Jiri Slaby <jslaby@suse.cz> | 2010-07-19 13:39:34 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 15:42:57 -0400 |
commit | 37b58bfe4bb3df303aa9d7f1ccdbfc477b42c5e2 (patch) | |
tree | f82417c863f6e4268bc56a12bffd46ab4739adba /drivers/media/video | |
parent | 6efb870a115ac223ab578bc76699ba8591250568 (diff) |
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/ivtv/ivtvfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 2c2d862ca89f..be03a712731c 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c | |||
@@ -1239,7 +1239,7 @@ static int __init ivtvfb_callback_init(struct device *dev, void *p) | |||
1239 | struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); | 1239 | struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); |
1240 | struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); | 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 | if (ivtvfb_init_card(itv) == 0) { | 1243 | if (ivtvfb_init_card(itv) == 0) { |
1244 | IVTVFB_INFO("Framebuffer registered on %s\n", | 1244 | IVTVFB_INFO("Framebuffer registered on %s\n", |
1245 | itv->v4l2_dev.name); | 1245 | itv->v4l2_dev.name); |
@@ -1255,7 +1255,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p) | |||
1255 | struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); | 1255 | struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); |
1256 | struct osd_info *oi = itv->osd_info; | 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 | if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) { | 1259 | if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) { |
1260 | IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n", | 1260 | IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n", |
1261 | itv->instance); | 1261 | itv->instance); |