Commit 51427ec0 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds
Browse files

[PATCH] PNP: adjust pnp_register_card_driver() signature: als100 



Remove the assumption that pnp_register_card_driver() returns the
number of devices claimed.  And fix a __init/__devinit issue.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5f53f4e2

sound/isa/als100.c

+10 −4
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard, 
	return 0;

}



static int __init snd_card_als100_probe(int dev,

static int __devinit snd_card_als100_probe(int dev,

					struct pnp_card_link *pcard,

					const struct pnp_card_device_id *pid)

{
@@ -281,6 +281,8 @@ static int __init snd_card_als100_probe(int dev, 
	return 0;

}



static unsigned int __devinitdata als100_devices;



static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,

					   const struct pnp_card_device_id *id)

{
@@ -294,6 +296,7 @@ static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card, 
		if (res < 0)

			return res;

		dev++;

		als100_devices++;

		return 0;

	}

	return -ENODEV;
@@ -345,10 +348,13 @@ static struct pnp_card_driver als100_pnpc_driver = { 


static int __init alsa_card_als100_init(void)

{

	int cards;

	int err;



	err = pnp_register_card_driver(&als100_pnpc_driver);

	if (err)

		return err;



	cards = pnp_register_card_driver(&als100_pnpc_driver);

	if (cards <= 0) {

	if (!als100_devices) {

		pnp_unregister_card_driver(&als100_pnpc_driver);

#ifdef MODULE

		snd_printk(KERN_ERR "no ALS100 based soundcards found\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE