From patchwork Sun Jul 1 20:15:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 1145151 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 79195DFB7C for ; Sun, 1 Jul 2012 20:16:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346Ab2GAUP5 (ORCPT ); Sun, 1 Jul 2012 16:15:57 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:54268 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750861Ab2GAUP4 (ORCPT ); Sun, 1 Jul 2012 16:15:56 -0400 Received: by mail-qc0-f174.google.com with SMTP id o28so2600569qcr.19 for ; Sun, 01 Jul 2012 13:15:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=gdWRdGVbFj6uOZexhwLqYaMmRBh85lJfn42wZ+cPins=; b=TssnCbQzhSbvuzIHTnkLIamy8CMPq4nyWjUzTW6mcRbDPCZIzBMlnFYyX2xpSOHtOT BwSjSUiCTMvOk+LkIPXuND4YfZCWzgyD8eY9b/RWsxgo8wAvlEvtnAhFoKiAFZdBo92s 1WDiDyC67WnTiFK3sl0Xi1RBp/51gOaRGNgEma8bq+oMo1LgdQFzg9N3HaHpTg25VlJo RDocb2E9ouhu7EjvcBy2IGywbYkZw5d5i/83gCnmHshPf7Z6uwTe4v9J69rEY86EnLpV TeDvdXQe2qzgeS7WPNaZgwlYkZUzVjhfZGEYHwW7ILkS03ToGSE+s29kmnzdySlvz9Et QrfQ== Received: by 10.224.86.194 with SMTP id t2mr18527742qal.95.1341173756276; Sun, 01 Jul 2012 13:15:56 -0700 (PDT) Received: from localhost.localdomain (pool-108-54-72-165.nycmny.fios.verizon.net. [108.54.72.165]) by mx.google.com with ESMTPS id cz12sm26276384qab.5.2012.07.01.13.15.55 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Jul 2012 13:15:55 -0700 (PDT) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller Subject: [PATCH 3/6] cx25840: fix regression in HVR-1800 analog audio Date: Sun, 1 Jul 2012 16:15:11 -0400 Message-Id: <1341173714-23627-4-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1341173714-23627-1-git-send-email-dheitmueller@kernellabs.com> References: <1341173714-23627-1-git-send-email-dheitmueller@kernellabs.com> X-Gm-Message-State: ALoCoQle8V9jbEC6JNCKbUgzYntiSIFcVzjAqkixZVo6tadGuqLpooXNm43v6zDQqxQId+YdhenJ Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The refactoring of the cx25840 driver to support the cx23888 caused breakage with the existing support for cx23885/cx23887 analog audio support. Tweak the code so that it only uses the code if it really is a cx23888 instead of applying it to all cx2388x based devices. Validated with the following boards: HVR-1800 retail (0070:7801) HVR-1800 OEM (0070:7809) HVR_1850 retail (0070:8541) Thanks to Steven Toth and Hauppauge for loaning me various boards to regression test with. Reported-by: Jonathan Thanks-to: Steven Toth Signed-off-by: Devin Heitmueler --- drivers/media/video/cx25840/cx25840-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index e12b3b0..7dc7bb1 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -1250,7 +1250,7 @@ static int set_input(struct i2c_client *client, enum cx25840_video_input vid_inp cx25840_write4(client, 0x8d0, 0x1f063870); } - if (is_cx2388x(state)) { + if (is_cx23888(state)) { /* HVR1850 */ /* AUD_IO_CTRL - I2S Input, Parallel1*/ /* - Channel 1 src - Parallel1 (Merlin out) */