diff options
Diffstat (limited to 'sound/isa/sb/es968.c')
-rw-r--r-- | sound/isa/sb/es968.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c index 9da80bfa3027..d4d65b84265a 100644 --- a/sound/isa/sb/es968.c +++ b/sound/isa/sb/es968.c | |||
@@ -124,7 +124,7 @@ static int __devinit snd_card_es968_pnp(int dev, struct snd_card_es968 *acard, | |||
124 | return 0; | 124 | return 0; |
125 | } | 125 | } |
126 | 126 | ||
127 | static int __init snd_card_es968_probe(int dev, | 127 | static int __devinit snd_card_es968_probe(int dev, |
128 | struct pnp_card_link *pcard, | 128 | struct pnp_card_link *pcard, |
129 | const struct pnp_card_device_id *pid) | 129 | const struct pnp_card_device_id *pid) |
130 | { | 130 | { |
@@ -182,6 +182,8 @@ static int __init snd_card_es968_probe(int dev, | |||
182 | return 0; | 182 | return 0; |
183 | } | 183 | } |
184 | 184 | ||
185 | static unsigned int __devinitdata es968_devices; | ||
186 | |||
185 | static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card, | 187 | static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card, |
186 | const struct pnp_card_device_id *id) | 188 | const struct pnp_card_device_id *id) |
187 | { | 189 | { |
@@ -195,6 +197,7 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *card, | |||
195 | if (res < 0) | 197 | if (res < 0) |
196 | return res; | 198 | return res; |
197 | dev++; | 199 | dev++; |
200 | es968_devices++; | ||
198 | return 0; | 201 | return 0; |
199 | } | 202 | } |
200 | return -ENODEV; | 203 | return -ENODEV; |
@@ -246,8 +249,11 @@ static struct pnp_card_driver es968_pnpc_driver = { | |||
246 | 249 | ||
247 | static int __init alsa_card_es968_init(void) | 250 | static int __init alsa_card_es968_init(void) |
248 | { | 251 | { |
249 | int cards = pnp_register_card_driver(&es968_pnpc_driver); | 252 | int err = pnp_register_card_driver(&es968_pnpc_driver); |
250 | if (cards <= 0) { | 253 | if (err) |
254 | return err; | ||
255 | |||
256 | if (!es968_devices) { | ||
251 | pnp_unregister_card_driver(&es968_pnpc_driver); | 257 | pnp_unregister_card_driver(&es968_pnpc_driver); |
252 | #ifdef MODULE | 258 | #ifdef MODULE |
253 | snd_printk(KERN_ERR "no ES968 based soundcards found\n"); | 259 | snd_printk(KERN_ERR "no ES968 based soundcards found\n"); |