From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750956AbWGQQeJ (ORCPT ); Mon, 17 Jul 2006 12:34:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750993AbWGQQdu (ORCPT ); Mon, 17 Jul 2006 12:33:50 -0400 Received: from mail.kroah.org ([69.55.234.183]:51899 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S1750968AbWGQQdC (ORCPT ); Mon, 17 Jul 2006 12:33:02 -0400 Date: Mon, 17 Jul 2006 09:26:23 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, v4l-dvb maintainer list , Andrew de Quincey , Michael Krufky , Chris Wright , Greg Kroah-Hartman Subject: [patch 08/45] v4l/dvb: Fix CI interface on PRO KNC1 cards Message-ID: <20060717162623.GI4829@kroah.com> References: <20060717160652.408007000@blue.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="dvb-fix-ci-interface-on-pro-knc1-cards.patch" In-Reply-To: <20060717162452.GA4829@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ From: Andrew de Quincey The original driver had a restriction that if a card as an saa7113 chip, then it cannot have a CI interface. This is not the case. Signed-off-by: Andrew de Quincey Signed-off-by: Michael Krufky Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- drivers/media/dvb/ttpci/budget-av.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- linux-2.6.17.3.orig/drivers/media/dvb/ttpci/budget-av.c +++ linux-2.6.17.3/drivers/media/dvb/ttpci/budget-av.c @@ -1218,11 +1218,7 @@ static int budget_av_attach(struct saa71 budget_av->budget.dvb_adapter.priv = budget_av; frontend_init(budget_av); - - if (!budget_av->has_saa7113) { - ciintf_init(budget_av); - } - + ciintf_init(budget_av); return 0; } --