From patchwork Tue Apr 14 00:53:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Walls X-Patchwork-Id: 17973 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n3DNqNhK001999 for ; Mon, 13 Apr 2009 23:52:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbZDMXwI (ORCPT ); Mon, 13 Apr 2009 19:52:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752387AbZDMXwI (ORCPT ); Mon, 13 Apr 2009 19:52:08 -0400 Received: from mail1.radix.net ([207.192.128.31]:49373 "EHLO mail1.radix.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751686AbZDMXwH (ORCPT ); Mon, 13 Apr 2009 19:52:07 -0400 Received: from [192.168.1.2] (02-035.155.popsite.net [66.217.132.35]) (authenticated bits=0) by mail1.radix.net (8.13.4/8.13.4) with ESMTP id n3DNpiur000270; Mon, 13 Apr 2009 19:51:46 -0400 (EDT) Subject: [PULL] http://linuxtv.org/hg/awalls/v4l-dvb From: Andy Walls To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl Date: Mon, 13 Apr 2009 20:53:24 -0400 Message-Id: <1239670404.3163.42.camel@palomino.walls.org> Mime-Version: 1.0 X-Mailer: Evolution 2.24.1 (2.24.1-2.fc10) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Mauro, Please pull from http://linuxtv.org/hg/~awalls/v4l-dvb for cx18: Send correct input routing value to external audio multiplexers This change fixes a bug introduced by a late v4l2_subdev change. Without this fix, Line-in audio and FM radio for CX23418 based cards will be broken. I inspected ivtv and it seems to be unaffected. Regards, Andy --- 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 diffstat: cx18-audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) And since the diff is so small: diff -r dba0b6fae413 linux/drivers/media/video/cx18/cx18-audio.c --- a/linux/drivers/media/video/cx18/cx18-audio.c Thu Apr 09 08:21:42 2009 -0300 +++ b/linux/drivers/media/video/cx18/cx18-audio.c Mon Apr 13 20:50:08 2009 -0400 @@ -44,7 +44,7 @@ /* handle muxer chips */ v4l2_subdev_call(cx->sd_extmux, audio, s_routing, - in->audio_input, 0, 0); + (u32) in->muxer_input, 0, 0); err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl, audio, s_routing, in->audio_input, 0, 0);