From patchwork Wed Sep 16 22:28:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 1611 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Wed, 16 Sep 2009 22:41:11 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Wed, 16 Sep 2009 19:41:21 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Mo3BW-0007sF-Vn; Wed, 16 Sep 2009 22:41:11 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760257AbZIPWfd (ORCPT + 1 other); Wed, 16 Sep 2009 18:35:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758103AbZIPWcu (ORCPT ); Wed, 16 Sep 2009 18:32:50 -0400 Received: from kroah.org ([198.145.64.141]:40981 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760074AbZIPWcp (ORCPT ); Wed, 16 Sep 2009 18:32:45 -0400 Received: from localhost (c-98-246-45-209.hsd1.or.comcast.net [98.246.45.209]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by coco.kroah.org (Postfix) with ESMTPSA id BB5AB48A43; Wed, 16 Sep 2009 15:32:48 -0700 (PDT) X-Mailbox-Line: From gregkh@mini.kroah.org Wed Sep 16 15:29:04 2009 Message-Id: <20090916222904.181440643@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Wed, 16 Sep 2009 15:28:39 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Larry Finger , linux-media , Mauro Carvalho Chehab , Douglas Schilling Landgraf , Franklin Meng , Michael Krufky Subject: [patch 20/24] V4L: em28xx: set up tda9887_conf in em28xx_card_setup() References: <20090916222819.244332644@mini.kroah.org> Content-Disposition: inline; filename=v4l-em28xx-set-up-tda9887_conf-in-em28xx_card_setup.patch Lines: 32 In-Reply-To: <20090916222934.GA31846@kroah.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 2.6.30-stable review patch. If anyone has any objections, please let us know. ------------------ From: Franklin Meng V4L: em28xx: set up tda9887_conf in em28xx_card_setup() (cherry picked from commit ae3340cbf59ea362c2016eea762456cc0969fd9e) Added tda9887_conf set up into em28xx_card_setup() Signed-off-by: Franklin Meng Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab Tested-by: Larry Finger Signed-off-by: Michael Krufky Signed-off-by: Greg Kroah-Hartman --- drivers/media/video/em28xx/em28xx-cards.c | 3 +++ 1 file changed, 3 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -1886,6 +1886,9 @@ void em28xx_card_setup(struct em28xx *de if (em28xx_boards[dev->model].tuner_addr) dev->tuner_addr = em28xx_boards[dev->model].tuner_addr; + if (em28xx_boards[dev->model].tda9887_conf) + dev->tda9887_conf = em28xx_boards[dev->model].tda9887_conf; + /* request some modules */ switch (dev->model) { case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2: