Commit 38125956 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

[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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent be54414d
...@@ -1255,7 +1255,7 @@ static int __devinit create_sscape(int dev, struct snd_card **rcardp) ...@@ -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; int dev = pdev->id;
struct snd_card *card; struct snd_card *card;
...@@ -1469,7 +1469,7 @@ static int __init sscape_init(void) ...@@ -1469,7 +1469,7 @@ static int __init sscape_init(void)
if (ret < 0) if (ret < 0)
return ret; return ret;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
if (pnp_register_card_driver(&sscape_pnpc_driver) >= 0) if (pnp_register_card_driver(&sscape_pnpc_driver) == 0)
pnp_registered = 1; pnp_registered = 1;
#endif #endif
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment