mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 12:10:52 -04:00
[PATCH] PNP: adjust pnp_register_card_driver() signature: dt019x
Remove the assumption that pnp_register_card_driver() returns the number of devices claimed. 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:
parent
07d58ad06b
commit
6736a6587b
1 changed files with 9 additions and 3 deletions
|
|
@ -272,6 +272,8 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static unsigned int __devinitdata dt019x_devices;
|
||||
|
||||
static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
|
||||
const struct pnp_card_device_id *pid)
|
||||
{
|
||||
|
|
@ -285,6 +287,7 @@ static int __devinit snd_dt019x_pnp_probe(struct pnp_card_link *card,
|
|||
if (res < 0)
|
||||
return res;
|
||||
dev++;
|
||||
dt019x_devices++;
|
||||
return 0;
|
||||
}
|
||||
return -ENODEV;
|
||||
|
|
@ -336,10 +339,13 @@ static struct pnp_card_driver dt019x_pnpc_driver = {
|
|||
|
||||
static int __init alsa_card_dt019x_init(void)
|
||||
{
|
||||
int cards = 0;
|
||||
int err;
|
||||
|
||||
cards = pnp_register_card_driver(&dt019x_pnpc_driver);
|
||||
if (cards <= 0) {
|
||||
err = pnp_register_card_driver(&dt019x_pnpc_driver);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
if (!dt019x_devices) {
|
||||
pnp_unregister_card_driver(&dt019x_pnpc_driver);
|
||||
#ifdef MODULE
|
||||
snd_printk(KERN_ERR "no DT-019X / ALS-007 based soundcards found\n");
|
||||
|
|
|
|||
Loading…
Reference in a new issue