From patchwork Tue Jun 22 11:41:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 3691 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 22 Jun 2010 11:47:50 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Tue, 22 Jun 2010 10:59:03 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OR1xG-0007bd-0n; Tue, 22 Jun 2010 11:47:50 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752781Ab0FVLrs (ORCPT + 1 other); Tue, 22 Jun 2010 07:47:48 -0400 Received: from mail.pripojeni.net ([217.66.174.14]:50025 "EHLO mail.jetsystems.cz" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752441Ab0FVLrs (ORCPT ); Tue, 22 Jun 2010 07:47:48 -0400 X-Greylist: delayed 358 seconds by postgrey-1.27 at vger.kernel.org; Tue, 22 Jun 2010 07:47:47 EDT Received: from anemoi.localdomain ([217.66.174.142]) by mail.jetsystems.cz (Kerio Connect 7.0.0 patch 1); Tue, 22 Jun 2010 13:52:20 +0200 From: Jiri Slaby To: mchehab@infradead.org Cc: linux-kernel@vger.kernel.org, jirislaby@gmail.com, Jiri Slaby , Andy Walls , Tejun Heo , Ian Armstrong , ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org Subject: [PATCH] VIDEO: ivtvfb, remove unneeded NULL test Date: Tue, 22 Jun 2010 13:41:50 +0200 Message-Id: <1277206910-27228-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.7.1 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Stanse found that in ivtvfb_callback_cleanup there is an unneeded test for itv being NULL. But itv is initialized as container_of with non-zero offset, 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 Cc: Andy Walls Cc: Mauro Carvalho Chehab Cc: Tejun Heo Cc: Ian Armstrong Cc: ivtv-devel@ivtvdriver.org Cc: linux-media@vger.kernel.org --- drivers/media/video/ivtv/ivtvfb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 9ff3425..5dc460e 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -1219,7 +1219,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p) struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); struct osd_info *oi = itv->osd_info; - if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { + if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) { IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n", itv->instance);