From patchwork Wed Mar 3 11:39:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: e9hack X-Patchwork-Id: 83319 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o23Bdc28031014 for ; Wed, 3 Mar 2010 11:39:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752722Ab0CCLjh (ORCPT ); Wed, 3 Mar 2010 06:39:37 -0500 Received: from fg-out-1718.google.com ([72.14.220.157]:23658 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752323Ab0CCLjg (ORCPT ); Wed, 3 Mar 2010 06:39:36 -0500 Received: by fg-out-1718.google.com with SMTP id l26so247448fgb.1 for ; Wed, 03 Mar 2010 03:39:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:x-enigmail-version :content-type:content-transfer-encoding; bh=5z4l6FOThWCX1gW6hFFj9B50kce/C07/wPueHJEUXcc=; b=KJLREKmcqz0g6BLb8VeVt6W4SechewBfvawHmyMBOGo15TZO+bx31hm8MUSOgnB0+J F9LMJqkhfMlDQShSryiCpnJKWxmtv0Ta3RX0rO6bDairsqzBQpLZuMIm1Y0IbjTdo+2S jIXofYPeqiey50avVDMlZFZGJtnaBL8AzX/Ow= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :x-enigmail-version:content-type:content-transfer-encoding; b=FCBUI/Rsqm8yLg9s3T4/Sd3D/obBDKOUV6CP5WV1qLQPKeq+cmavXxHa2vUfYaGfvd S58GHHNlZpj+MOEYR+fV+G0uro+uokkHmvXPUny1aNfk8iPOhTfCWCpDFsiS0fiLPZYf S4qKqHenLtqUSnxKN/poHfclPQ4O4X7n4zh/E= Received: by 10.102.16.25 with SMTP id 25mr6040077mup.40.1267616374324; Wed, 03 Mar 2010 03:39:34 -0800 (PST) Received: from ?192.168.23.2? (p57B42E40.dip0.t-ipconnect.de [87.180.46.64]) by mx.google.com with ESMTPS id 14sm29172602muo.2.2010.03.03.03.39.32 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 03 Mar 2010 03:39:33 -0800 (PST) Message-ID: <4B8E4A6F.2050809@googlemail.com> Date: Wed, 03 Mar 2010 12:39:27 +0100 From: e9hack User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.1.8) Gecko/20100216 Lightning/1.0b1 Thunderbird/3.0.2 MIME-Version: 1.0 To: dougsland@redhat.com CC: hverkuil@xs4all.nl, Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: changeset 14351:2eda2bcc8d6f X-Enigmail-Version: 1.0.1 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]); Wed, 03 Mar 2010 11:39:38 +0000 (UTC) diff -r 58ae12f18e80 linux/drivers/media/common/saa7146_fops.c --- a/linux/drivers/media/common/saa7146_fops.c Tue Mar 02 23:52:36 2010 -0300 +++ b/linux/drivers/media/common/saa7146_fops.c Wed Mar 03 12:15:23 2010 +0100 @@ -481,8 +481,10 @@ int saa7146_vv_release(struct saa7146_de DEB_EE(("dev:%p\n",dev)); v4l2_device_unregister(&dev->v4l2_dev); - pci_free_consistent(dev->pci, SAA7146_CLIPPING_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle); - kfree(vv); + if (vv) { + pci_free_consistent(dev->pci, SAA7146_CLIPPING_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle); + kfree(vv); + } dev->vv_data = NULL; dev->vv_callback = NULL; diff -r 58ae12f18e80 linux/drivers/media/dvb/ttpci/av7110_v4l.c --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c Tue Mar 02 23:52:36 2010 -0300 +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c Wed Mar 03 12:15:23 2010 +0100 @@ -790,12 +790,20 @@ int av7110_init_v4l(struct av7110 *av711 vv_data = &av7110_vv_data_c; else vv_data = &av7110_vv_data_st; + ret = saa7146_vv_devinit(dev); + + if (ret < 0) { + ERR(("cannot init device. skipping.\n")); + return ret; + } + ret = saa7146_vv_init(dev, vv_data); - - if (ret) { + if (ret < 0) { ERR(("cannot init capture device. skipping.\n")); + saa7146_vv_release(dev); return ret; } + vv_data->ops.vidioc_enum_input = vidioc_enum_input; vv_data->ops.vidioc_g_input = vidioc_g_input; vv_data->ops.vidioc_s_input = vidioc_s_input;