[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>
This commit is contained in:
parent
be54414d59
commit
3812595644
1 changed files with 2 additions and 2 deletions
|
@ -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)
|
||||||
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;
|
||||||
|
|
Loading…
Reference in a new issue