diff options
author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /sound/oss/cs4232.c | |
parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) |
Merge ../linux-2.6
Diffstat (limited to 'sound/oss/cs4232.c')
-rw-r--r-- | sound/oss/cs4232.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sound/oss/cs4232.c b/sound/oss/cs4232.c index 7c59e2d4003a..c7f86f09c28d 100644 --- a/sound/oss/cs4232.c +++ b/sound/oss/cs4232.c | |||
@@ -360,6 +360,8 @@ static int __initdata synthio = -1; | |||
360 | static int __initdata synthirq = -1; | 360 | static int __initdata synthirq = -1; |
361 | static int __initdata isapnp = 1; | 361 | static int __initdata isapnp = 1; |
362 | 362 | ||
363 | static unsigned int cs4232_devices; | ||
364 | |||
363 | MODULE_DESCRIPTION("CS4232 based soundcard driver"); | 365 | MODULE_DESCRIPTION("CS4232 based soundcard driver"); |
364 | MODULE_AUTHOR("Hannu Savolainen, Paul Barton-Davis"); | 366 | MODULE_AUTHOR("Hannu Savolainen, Paul Barton-Davis"); |
365 | MODULE_LICENSE("GPL"); | 367 | MODULE_LICENSE("GPL"); |
@@ -421,6 +423,7 @@ static int cs4232_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev | |||
421 | return -ENODEV; | 423 | return -ENODEV; |
422 | } | 424 | } |
423 | pnp_set_drvdata(dev,isapnpcfg); | 425 | pnp_set_drvdata(dev,isapnpcfg); |
426 | cs4232_devices++; | ||
424 | return 0; | 427 | return 0; |
425 | } | 428 | } |
426 | 429 | ||
@@ -455,10 +458,11 @@ static int __init init_cs4232(void) | |||
455 | #endif | 458 | #endif |
456 | cfg.irq = -1; | 459 | cfg.irq = -1; |
457 | 460 | ||
458 | if (isapnp && | 461 | if (isapnp) { |
459 | (pnp_register_driver(&cs4232_driver) > 0) | 462 | pnp_register_driver(&cs4232_driver); |
460 | ) | 463 | if (cs4232_devices) |
461 | return 0; | 464 | return 0; |
465 | } | ||
462 | 466 | ||
463 | if(io==-1||irq==-1||dma==-1) | 467 | if(io==-1||irq==-1||dma==-1) |
464 | { | 468 | { |
@@ -503,7 +507,8 @@ static int __init setup_cs4232(char *str) | |||
503 | int ints[7]; | 507 | int ints[7]; |
504 | 508 | ||
505 | /* If we have isapnp cards, no need for options */ | 509 | /* If we have isapnp cards, no need for options */ |
506 | if (pnp_register_driver(&cs4232_driver) > 0) | 510 | pnp_register_driver(&cs4232_driver); |
511 | if (cs4232_devices) | ||
507 | return 1; | 512 | return 1; |
508 | 513 | ||
509 | str = get_options(str, ARRAY_SIZE(ints), ints); | 514 | str = get_options(str, ARRAY_SIZE(ints), ints); |