From patchwork Fri May 22 10:19:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schwarzott X-Patchwork-Id: 1125 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Fri, 22 May 2009 10:19:23 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Fri, 22 May 2009 07:21:23 -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 1M7RqU-0003vS-Lw; Fri, 22 May 2009 10:19:22 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751590AbZEVKTT (ORCPT + 1 other); Fri, 22 May 2009 06:19:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751764AbZEVKTT (ORCPT ); Fri, 22 May 2009 06:19:19 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:48715 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590AbZEVKTS (ORCPT ); Fri, 22 May 2009 06:19:18 -0400 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 64ABD1C153AF; Fri, 22 May 2009 12:19:18 +0200 (CEST) Received: from localhost (dynscan2.mnet-online.de [192.168.1.215]) by mail.m-online.net (Postfix) with ESMTP id 359B8900A3; Fri, 22 May 2009 12:19:18 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.3.149]) by localhost (dynscan2.mnet-online.de [192.168.1.215]) (amavisd-new, port 10024) with ESMTP id Q4n2JpvRAa5a; Fri, 22 May 2009 12:19:17 +0200 (CEST) Received: from gauss.x.fun (ppp-88-217-106-215.dynamic.mnet-online.de [88.217.106.215]) by mail.nefkom.net (Postfix) with ESMTP; Fri, 22 May 2009 12:19:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by gauss.x.fun (Postfix) with ESMTP id 593E8A919; Fri, 22 May 2009 12:19:16 +0200 (CEST) From: Matthias Schwarzott To: linux-media@vger.kernel.org, Patrick Boettcher , Mauro Carvalho Chehab Subject: [PATCH] flexcop-pci: dmesg visible names broken Date: Fri, 22 May 2009 12:19:14 +0200 User-Agent: KMail/1.9.10 Cc: Uwe Bugla MIME-Version: 1.0 Message-Id: <200905221219.14832.zzam@gentoo.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi there! The patch hg 11287: 39b90315474c broke user visible names of flexcop-pci devices, as it did reorder the enum of card types, but did not adjust the array containing the card names. This patch reorders the names, and also uses [FC_AIR_DVBT] = "Air2PC/AirStar 2 DVB-T" assignment style for more clarity. It also adds the revision Number to the name for SkyStar rev. 2.3 and rev 2.6 as I think it is useful to see in log output. Signed-off-by: Matthias Schwarzott Regards Matthias Index: v4l-dvb/linux/drivers/media/dvb/b2c2/flexcop-misc.c =================================================================== --- v4l-dvb.orig/linux/drivers/media/dvb/b2c2/flexcop-misc.c +++ v4l-dvb/linux/drivers/media/dvb/b2c2/flexcop-misc.c @@ -46,16 +46,16 @@ static const char *flexcop_revision_name }; static const char *flexcop_device_names[] = { - "Unknown device", - "Air2PC/AirStar 2 DVB-T", - "Air2PC/AirStar 2 ATSC 1st generation", - "Air2PC/AirStar 2 ATSC 2nd generation", - "Sky2PC/SkyStar 2 DVB-S", - "Sky2PC/SkyStar 2 DVB-S (old version)", - "Cable2PC/CableStar 2 DVB-C", - "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)", - "Sky2PC/SkyStar 2 DVB-S rev 2.7a/u", - "Sky2PC/SkyStar 2 DVB-S rev 2.8", + [FC_UNK] = "Unknown device", + [FC_CABLE] = "Cable2PC/CableStar 2 DVB-C", + [FC_AIR_DVBT] = "Air2PC/AirStar 2 DVB-T", + [FC_AIR_ATSC1] = "Air2PC/AirStar 2 ATSC 1st generation", + [FC_AIR_ATSC2] = "Air2PC/AirStar 2 ATSC 2nd generation", + [FC_AIR_ATSC3] = "Air2PC/AirStar 2 ATSC 3rd generation (HD5000)", + [FC_SKY_REV23] = "Sky2PC/SkyStar 2 DVB-S rev 2.3 (old version)", + [FC_SKY_REV26] = "Sky2PC/SkyStar 2 DVB-S rev 2.6", + [FC_SKY_REV27] = "Sky2PC/SkyStar 2 DVB-S rev 2.7a/u", + [FC_SKY_REV28] = "Sky2PC/SkyStar 2 DVB-S rev 2.8", }; static const char *flexcop_bus_names[] = {