diff options
Diffstat (limited to 'sound/isa/sscape.c')
| -rw-r--r-- | sound/isa/sscape.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 5fb981c0a281..29bba8cc3ef3 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c | |||
| @@ -69,9 +69,9 @@ module_param_array(dma, int, NULL, 0444); | |||
| 69 | MODULE_PARM_DESC(dma, "DMA # for SoundScape driver."); | 69 | MODULE_PARM_DESC(dma, "DMA # for SoundScape driver."); |
| 70 | 70 | ||
| 71 | static struct platform_device *platform_devices[SNDRV_CARDS]; | 71 | static struct platform_device *platform_devices[SNDRV_CARDS]; |
| 72 | static int pnp_registered; | ||
| 73 | 72 | ||
| 74 | #ifdef CONFIG_PNP | 73 | #ifdef CONFIG_PNP |
| 74 | static int pnp_registered; | ||
| 75 | static struct pnp_card_device_id sscape_pnpids[] = { | 75 | static struct pnp_card_device_id sscape_pnpids[] = { |
| 76 | { .id = "ENS3081", .devs = { { "ENS0000" } } }, | 76 | { .id = "ENS3081", .devs = { { "ENS0000" } } }, |
| 77 | { .id = "" } /* end */ | 77 | { .id = "" } /* end */ |
| @@ -1391,8 +1391,10 @@ static void __init_or_module sscape_unregister_all(void) | |||
| 1391 | { | 1391 | { |
| 1392 | int i; | 1392 | int i; |
| 1393 | 1393 | ||
| 1394 | #ifdef CONFIG_PNP | ||
| 1394 | if (pnp_registered) | 1395 | if (pnp_registered) |
| 1395 | pnp_unregister_card_driver(&sscape_pnpc_driver); | 1396 | pnp_unregister_card_driver(&sscape_pnpc_driver); |
| 1397 | #endif | ||
| 1396 | for (i = 0; i < ARRAY_SIZE(platform_devices); ++i) | 1398 | for (i = 0; i < ARRAY_SIZE(platform_devices); ++i) |
| 1397 | platform_device_unregister(platform_devices[i]); | 1399 | platform_device_unregister(platform_devices[i]); |
| 1398 | platform_driver_unregister(&snd_sscape_driver); | 1400 | platform_driver_unregister(&snd_sscape_driver); |
| @@ -1466,8 +1468,10 @@ static int __init sscape_init(void) | |||
| 1466 | ret = sscape_manual_probe(); | 1468 | ret = sscape_manual_probe(); |
| 1467 | if (ret < 0) | 1469 | if (ret < 0) |
| 1468 | return ret; | 1470 | return ret; |
| 1471 | #ifdef CONFIG_PNP | ||
| 1469 | if (pnp_register_card_driver(&sscape_pnpc_driver) >= 0) | 1472 | if (pnp_register_card_driver(&sscape_pnpc_driver) >= 0) |
| 1470 | pnp_registered = 1; | 1473 | pnp_registered = 1; |
| 1474 | #endif | ||
| 1471 | return 0; | 1475 | return 0; |
| 1472 | } | 1476 | } |
| 1473 | 1477 | ||
