From patchwork Sat Sep 12 14:31:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ira Krufky X-Patchwork-Id: 1579 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Sat, 12 Sep 2009 14:31:15 +0000 Received: from bombadil.infradead.org [18.85.46.34] by caramujo.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Sat, 12 Sep 2009 11:32:43 -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 1MmTdD-0005vA-O0; Sat, 12 Sep 2009 14:31:15 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753831AbZILObF (ORCPT + 1 other); Sat, 12 Sep 2009 10:31:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754149AbZILObE (ORCPT ); Sat, 12 Sep 2009 10:31:04 -0400 Received: from mail-ew0-f206.google.com ([209.85.219.206]:45600 "EHLO mail-ew0-f206.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752655AbZILObD (ORCPT ); Sat, 12 Sep 2009 10:31:03 -0400 Received: by ewy2 with SMTP id 2so1828559ewy.17 for ; Sat, 12 Sep 2009 07:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=SUoQS65EvK+zEu6YnwV2WZYS9GSX4le022/nKrZSZoY=; b=JHv1oyA/lksPvT8jxrRmAL1f8RQA9EP93YRfdoqpjiveIzgpl/NYlbKPW/XvZi+DE8 Y9JuNJscmjOkoQZ3lZ47zg53tnEEJhCR84kTOAniW/THvZD409WSeIFay4ynzqbyYty2 yL9oBzGMXvLZMnvvyb2+0Pqh/8aUa7HlmYax4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type; b=JfVRwXFEbx6aIu/h9n1/fWr8MmrzsAwO77EEPaDOI5LH4xd55ZPXxx1yTx5koGn5XQ f8X0uUiiYKbUqFEFtBpsUszF2aahu6CPgTtOiGKfpjNiCx+/t13Rz3NNCJWpTYTJhnhV rbLbTRVunSq4U9S6I6UmCHL0Xp+hhcyODuXeI= MIME-Version: 1.0 Received: by 10.216.20.129 with SMTP id p1mr734900wep.33.1252765865350; Sat, 12 Sep 2009 07:31:05 -0700 (PDT) Date: Sat, 12 Sep 2009 10:31:05 -0400 X-Google-Sender-Auth: 31080cafb88d7c47 Message-ID: <37219a840909120731j1166b2b0r8c51dc7ba8dbea6a@mail.gmail.com> Subject: [2.6.30.y PATCH 1/1] V4L: em28xx: set up tda9887_conf in em28xx_card_setup() From: Michael Krufky To: stable@kernel.org Cc: Franklin Meng , Douglas Schilling Landgraf , Mauro Carvalho Chehab , Larry Finger , linux-media Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org V4L: em28xx: set up tda9887_conf in em28xx_card_setup() From: Franklin Meng 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 (cherry picked from commit ae3340cbf59ea362c2016eea762456cc0969fd9e) --- drivers/media/video/em28xx/em28xx-cards.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 7c70738..168e892 100644 --- 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 *dev) 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: