X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=sound%2Fppc%2Fpowermac.c;h=5a929069dce980453a67d526450b9cf877fb9d09;hb=bc2fd381d8f9dbeb181f82286cdca1567e3d0def;hp=2264574fa06b7c317252653f75068f5e841a6235;hpb=db1a19b38f3a85f475b4ad716c71be133d8ca48e;p=karo-tx-linux.git

diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 2264574fa06b..5a929069dce9 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -18,7 +18,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
@@ -59,9 +58,9 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
 	char *name_ext;
 	int err;
 
-	card = snd_card_new(index, id, THIS_MODULE, 0);
-	if (card == NULL)
-		return -ENOMEM;
+	err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+	if (err < 0)
+		return err;
 
 	if ((err = snd_pmac_new(card, &chip)) < 0)
 		goto __error;
@@ -111,7 +110,7 @@ static int __init snd_pmac_probe(struct platform_device *devptr)
 			goto __error;
 		break;
 	default:
-		snd_printk("unsupported hardware %d\n", chip->model);
+		snd_printk(KERN_ERR "unsupported hardware %d\n", chip->model);
 		err = -EINVAL;
 		goto __error;
 	}