[alsa-devel] [PATCH] sound: fix incorrect use of platform_device_register()

Akinobu Mita akinobu.mita at gmail.com
Sat Apr 21 09:23:39 CEST 2007


The platform_device allocated by platform_device_alloc()
should be added to the device hierarchy by platform_device_add()
instead of platform_device_register().

Otherwise it will hit WARN_ON() in platform_device_register().
by illegal refcount.

This patch fixes such incorrect usages in portman2x4 and mts64 drivers.
Also it removes unnecessary trailing whitespaces.

Cc: Jaroslav Kysela <perex at suse.cz>
Signed-off-by: Akinobu Mita <akinobu.mita at gmail.com>

Index: 2.6-mm/sound/drivers/portman2x4.c
===================================================================
--- 2.6-mm.orig/sound/drivers/portman2x4.c
+++ 2.6-mm/sound/drivers/portman2x4.c
@@ -676,13 +676,13 @@ static void __devinit snd_portman_attach
 	struct platform_device *device;
 
 	device = platform_device_alloc(PLATFORM_DRIVER, device_count);
-	if (!device) 
+	if (!device)
 		return;
 
 	/* Temporary assignment to forward the parport */
 	platform_set_drvdata(device, p);
 
-	if (platform_device_register(device) < 0) {
+	if (platform_device_add(device) < 0) {
 		platform_device_put(device);
 		return;
 	}
Index: 2.6-mm/sound/drivers/mts64.c
===================================================================
--- 2.6-mm.orig/sound/drivers/mts64.c
+++ 2.6-mm/sound/drivers/mts64.c
@@ -892,13 +892,13 @@ static void __devinit snd_mts64_attach(s
 	struct platform_device *device;
 
 	device = platform_device_alloc(PLATFORM_DRIVER, device_count);
-	if (!device) 
+	if (!device)
 		return;
 
 	/* Temporary assignment to forward the parport */
 	platform_set_drvdata(device, p);
 
-	if (platform_device_register(device) < 0) {
+	if (platform_device_add(device) < 0) {
 		platform_device_put(device);
 		return;
 	}


More information about the Alsa-devel mailing list