X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=sound%2Fdrivers%2Fportman2x4.c;h=b1c047ec19afe6e5ce9e6cf1acb2124c72719d45;hb=9063974cdbc5463528cb6aa60c91bc0267af7bbb;hp=e065b2a6444aeefeb122c659aebae4abc152b2f7;hpb=53173920dab204a31ef37e7d2cb25b964a8a7752;p=cascardo%2Flinux.git

diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index e065b2a6444a..b1c047ec19af 100644
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -37,7 +37,6 @@
  *      - ported from alsa 0.5 to 1.0
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/parport.h>
@@ -668,7 +667,7 @@ static int __devinit snd_portman_probe_port(struct parport *p)
 	parport_release(pardev);
 	parport_unregister_device(pardev);
 
-	return res;
+	return res ? -EIO : 0;
 }
 
 static void __devinit snd_portman_attach(struct parport *p)
@@ -797,6 +796,8 @@ static int __devinit snd_portman_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, card);
 
+	snd_card_set_dev(card, &pdev->dev);
+
 	/* At this point card will be usable */
 	if ((err = snd_card_register(card)) < 0) {
 		snd_printd("Cannot register card\n");