[PATCH] PNP: adjust pnp_register_card_driver() signature: es968
Remove the assumption that pnp_register_card_driver() returns the number of devices claimed. And fix some __init/__devinit issues. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Adam Belay <ambx1@neo.rr.com> Cc: Jaroslav Kysela <perex@suse.cz> Acked-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
fea9739f2a
commit
6a3a3a0260
|
@ -124,7 +124,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __init snd_card_es968_probe(int dev,
|
static int __devinit snd_card_es968_probe(int dev,
|
||||||
struct pnp_card_link *pcard,
|
struct pnp_card_link *pcard,
|
||||||
const struct pnp_card_device_id *pid)
|
const struct pnp_card_device_id *pid)
|
||||||
{
|
{
|
||||||
|
@ -182,6 +182,8 @@ static int __init snd_card_es968_probe(int dev,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static unsigned int __devinitdata es968_devices;
|
||||||
|
|
||||||
static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
|
static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
|
||||||
const struct pnp_card_device_id *id)
|
const struct pnp_card_device_id *id)
|
||||||
{
|
{
|
||||||
|
@ -195,6 +197,7 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card,
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
return res;
|
return res;
|
||||||
dev++;
|
dev++;
|
||||||
|
es968_devices++;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -246,8 +249,11 @@ static struct pnp_card_driver es968_pnpc_driver = {
|
||||||
|
|
||||||
static int __init alsa_card_es968_init(void)
|
static int __init alsa_card_es968_init(void)
|
||||||
{
|
{
|
||||||
int cards = pnp_register_card_driver(&es968_pnpc_driver);
|
int err = pnp_register_card_driver(&es968_pnpc_driver);
|
||||||
if (cards <= 0) {
|
if (err)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
if (!es968_devices) {
|
||||||
pnp_unregister_card_driver(&es968_pnpc_driver);
|
pnp_unregister_card_driver(&es968_pnpc_driver);
|
||||||
#ifdef MODULE
|
#ifdef MODULE
|
||||||
snd_printk(KERN_ERR "no ES968 based soundcards found\n");
|
snd_printk(KERN_ERR "no ES968 based soundcards found\n");
|
||||||
|
|
Loading…
Reference in New Issue