A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 19:51:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Signed-off-by: Bjorn Helgaas <[email protected]>
Cc: Adam Belay <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Acked-by: Takashi Iwai <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Bjorn Helgaas 2006-03-27 01:17:09 -08:00 • committed by Linus Torvalds
commit 51427ec0f2
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sound/isa/als100.c
View file

@ -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;
cards = pnp_register_card_driver(&als100_pnpc_driver);
if (cards <= 0) {
err = pnp_register_card_driver(&als100_pnpc_driver);
if (err)
return err;
if (!als100_devices) {
pnp_unregister_card_driver(&als100_pnpc_driver);
#ifdef MODULE
snd_printk(KERN_ERR "no ALS100 based soundcards found\n");