From patchwork Sun Jul 10 19:57:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 962502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6AK1a0l020056 for ; Sun, 10 Jul 2011 20:01:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755761Ab1GJUBd (ORCPT ); Sun, 10 Jul 2011 16:01:33 -0400 Received: from oproxy8-pub.bluehost.com ([69.89.22.20]:47926 "HELO oproxy8-pub.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755939Ab1GJUAm (ORCPT ); Sun, 10 Jul 2011 16:00:42 -0400 Received: (qmail 2380 invoked by uid 0); 10 Jul 2011 20:00:41 -0000 Received: from unknown (HELO box742.bluehost.com) (66.147.244.242) by oproxy8.bluehost.com with SMTP; 10 Jul 2011 20:00:41 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=xenotime.net; h=Received:Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References:Organization:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=Mk1mVzvl+OQQQ/iBltPTySOpy15NbanKePq1kH92MBdOhWSTcQS70uq7iTVXpBlyFmhKkEAm1WPmsHwHnEgMSYoglnCibIaC9ZaUPFtJyBvcXXTX/EjOwxU89q0Wob8d; Received: from static-50-53-38-135.bvtn.or.frontiernet.net ([50.53.38.135] helo=chimera.site) by box742.bluehost.com with esmtpa (Exim 4.69) (envelope-from ) id 1Qg0BF-0002CN-CN; Sun, 10 Jul 2011 14:00:41 -0600 Date: Sun, 10 Jul 2011 12:57:36 -0700 From: Randy Dunlap To: lkml Cc: linux-media@vger.kernel.org, mchehab@infradead.org Subject: [PATCH 6/9] media/radio: fix terratec CONFIG IO PORT Message-Id: <20110710125736.0a16e25d.rdunlap@xenotime.net> In-Reply-To: <20110710125109.c72f9c2d.rdunlap@xenotime.net> References: <20110710125109.c72f9c2d.rdunlap@xenotime.net> Organization: YPO4 X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 X-Identified-User: {1807:box742.bluehost.com:xenotime:xenotime.net} {sentby:smtp auth 50.53.38.135 authed with rdunlap@xenotime.net} Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sun, 10 Jul 2011 20:01:37 +0000 (UTC) From: Randy Dunlap Modify radio-terratec to use HEX_STRING(CONFIG_RADIO_TERRATEC_PORT) so that the correct IO port value is used. Fixes the IO port value that is used since this is hex: CONFIG_RADIO_TERRATEC_PORT=590 but it was being interpreted as decimal instead of hex. Signed-off-by: Randy Dunlap --- drivers/media/radio/radio-terratec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 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 --- linux-next-20110707.orig/drivers/media/radio/radio-terratec.c +++ linux-next-20110707/drivers/media/radio/radio-terratec.c @@ -27,6 +27,7 @@ #include /* Modules */ #include /* Initdata */ #include /* request_region */ +#include #include /* kernel radio structs */ #include #include /* outb, outb_p */ @@ -39,10 +40,12 @@ MODULE_LICENSE("GPL"); MODULE_VERSION("0.0.3"); #ifndef CONFIG_RADIO_TERRATEC_PORT -#define CONFIG_RADIO_TERRATEC_PORT 0x590 +#define __RADIO_TERRATEC_PORT 0x590 +#else +#define __RADIO_TERRATEC_PORT HEX_STRING(CONFIG_RADIO_TERRATEC_PORT) #endif -static int io = CONFIG_RADIO_TERRATEC_PORT; +static int io = __RADIO_TERRATEC_PORT; static int radio_nr = -1; module_param(io, int, 0);