From patchwork Mon Jul 19 17:39:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 112725 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6JHdkG4023331 for ; Mon, 19 Jul 2010 17:40:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760828Ab0GSRjv (ORCPT ); Mon, 19 Jul 2010 13:39:51 -0400 Received: from mail.pripojeni.net ([217.66.174.14]:47423 "EHLO smtp.pripojeni.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1760783Ab0GSRju (ORCPT ); Mon, 19 Jul 2010 13:39:50 -0400 Received: from anemoi.localdomain ([217.66.174.142]) by smtp.pripojeni.net (Kerio Connect 7.0.0 patch 1); Mon, 19 Jul 2010 19:39:35 +0200 From: Jiri Slaby To: mchehab@infradead.org Cc: awalls@md.metrocast.net, jirislaby@gmail.com, linux-kernel@vger.kernel.org, Jiri Slaby , Tejun Heo , Ian Armstrong , ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org Subject: [PATCH 1/1] VIDEO: ivtvfb, remove unneeded NULL test Date: Mon, 19 Jul 2010 19:39:34 +0200 Message-Id: <1279561174-12468-1-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278346795.2229.2.camel@localhost> References: <1278346795.2229.2.camel@localhost> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 19 Jul 2010 17:40:42 +0000 (UTC) diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index 9ff3425..9c77bfa 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -1203,7 +1203,7 @@ static int __init ivtvfb_callback_init(struct device *dev, void *p) struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); - if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { + if (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT) { if (ivtvfb_init_card(itv) == 0) { IVTVFB_INFO("Framebuffer registered on %s\n", itv->v4l2_dev.name); @@ -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);