From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+willy=40w.ods.org-S262210AbVGFOPy@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S262210AbVGFOPy (ORCPT <rfc822;willy@w.ods.org>);
	Wed, 6 Jul 2005 10:15:54 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261794AbVGFOPx
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Wed, 6 Jul 2005 10:15:53 -0400
Received: from mail.suse.de ([195.135.220.2]:61629 "EHLO mx1.suse.de")
	by vger.kernel.org with ESMTP id S262231AbVGFKNx (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 6 Jul 2005 06:13:53 -0400
Date: Wed, 06 Jul 2005 12:13:50 +0200
Message-ID: <s5hekacdyxt.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Meelis Roos <mroos@linux.ee>
Cc: Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: Re: ALSA bt87x compile failure in 2.6.13-rc3
In-Reply-To: <Pine.SOC.4.61.0507060925010.22423@math.ut.ee>
References: <Pine.SOC.4.61.0507060925010.22423@math.ut.ee>
User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta18)
 (chestnut) (+CVS-20041021) (i386-suse-linux)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org

At Wed, 6 Jul 2005 09:27:36 +0300 (EEST),
Meelis Roos wrote:
> 
>    CC [M]  sound/pci/bt87x.o
> sound/pci/bt87x.c: In function `snd_bt87x_detect_card':
> sound/pci/bt87x.c:807: error: `driver' undeclared (first use in this function)
> sound/pci/bt87x.c:807: error: (Each undeclared identifier is reported only once
> sound/pci/bt87x.c:807: error: for each function it appears in.)
> sound/pci/bt87x.c: At top level:
> sound/pci/bt87x.c:910: error: `driver' used prior to declaration
> make[2]: *** [sound/pci/bt87x.o] Error 1
> 
> Substituting driver with pci->driver seems to cure it, it this the 
> correct fix?

The below one-liner should fix.


Takashi

----
[ALSA] Fix the compilation of bt87x.c

Use pci_match_id() function instead of pci_match_device() to compile
properly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -804,7 +804,7 @@ static int __devinit snd_bt87x_detect_ca
 	int i;
 	const struct pci_device_id *supported;
 
-	supported = pci_match_device(driver, pci);
+	supported = pci_match_id(snd_bt87x_ids, pci);
 	if (supported)
 		return supported->driver_data;