diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2006-03-27 01:17:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-27 08:44:54 -0800 |
| commit | 38125956441c5cab28333414cee308d162507477 (patch) | |
| tree | 85b0461fe5aa8a7f505aef7bfc71ae17c78fd3f1 /sound/isa | |
| parent | be54414d597b168d8c4eb2dafb8933ea15a7c148 (diff) | |
| download | kernel_samsung_smdk4412-38125956441c5cab28333414cee308d162507477.zip kernel_samsung_smdk4412-38125956441c5cab28333414cee308d162507477.tar.gz kernel_samsung_smdk4412-38125956441c5cab28333414cee308d162507477.tar.bz2 | |
[PATCH] PNP: adjust pnp_register_card_driver() signature: sscape
Remove the assumption that pnp_register_card_driver() returns the
number of devices claimed.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/sscape.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 29bba8c..48e5552 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -1255,7 +1255,7 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp) } -static int __init snd_sscape_probe(struct platform_device *pdev) +static int __devinit snd_sscape_probe(struct platform_device *pdev) { int dev = pdev->id; struct snd_card *card; @@ -1469,7 +1469,7 @@ static int __init sscape_init(void) if (ret < 0) return ret; #ifdef CONFIG_PNP - if (pnp_register_card_driver(&sscape_pnpc_driver) >= 0) + if (pnp_register_card_driver(&sscape_pnpc_driver) == 0) pnp_registered = 1; #endif return 0; |