From patchwork Sun Jul 4 04:11:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Walls X-Patchwork-Id: 110084 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 o644D3ax017725 for ; Sun, 4 Jul 2010 04:13:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751819Ab0GDEMZ (ORCPT ); Sun, 4 Jul 2010 00:12:25 -0400 Received: from proofpoint-cluster.metrocast.net ([65.175.128.136]:55738 "EHLO proofpoint-cluster.metrocast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751257Ab0GDEMZ (ORCPT ); Sun, 4 Jul 2010 00:12:25 -0400 Received: from [192.168.1.2] (d-216-36-24-245.cpe.metrocast.net [216.36.24.245]) (authenticated bits=0) by pear.metrocast.net (8.13.8/8.13.8) with ESMTP id o644BGsw029474; Sun, 4 Jul 2010 04:11:16 GMT Subject: Re: [PATCH] VIDEO: ivtvfb, remove unneeded NULL test From: Andy Walls To: Jiri Slaby Cc: mchehab@infradead.org, linux-kernel@vger.kernel.org, jirislaby@gmail.com, Tejun Heo , Ian Armstrong , ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org In-Reply-To: <1277206910-27228-1-git-send-email-jslaby@suse.cz> References: <1277206910-27228-1-git-send-email-jslaby@suse.cz> Date: Sun, 04 Jul 2010 00:11:47 -0400 Message-ID: <1278216707.2644.32.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 (2.28.3-1.fc12) X-Proofpoint-Virus-Version: vendor=fsecure engine=1.12.8161:2.4.5, 1.2.40, 4.0.166 definitions=2010-07-02_03:2010-02-06, 2010-07-02, 2010-07-03 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=5.0.0-1005130000 definitions=main-1007030141 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]); Sun, 04 Jul 2010 04:13:04 +0000 (UTC) diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb index 9ff3425..2b3259c 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c @@ -1201,9 +1201,14 @@ static int ivtvfb_init_card(struct ivtv *itv) 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); + struct ivtv *itv; - if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { + if (v4l2_dev == NULL) + return 0; + + itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); + + 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); @@ -1216,10 +1221,16 @@ static int __init ivtvfb_callback_init(struct device *de static int ivtvfb_callback_cleanup(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); - struct osd_info *oi = itv->osd_info; + struct ivtv *itv; + struct osd_info *oi; + + if (v4l2_dev == NULL) + return 0; + + itv = container_of(v4l2_dev, struct ivtv, v4l2_dev); + 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);