Commit 479ef436 authored by Akinobu Mita's avatar Akinobu Mita Committed by Jaroslav Kysela

[ALSA] sound: fix incorrect use of platform_device_register()

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.
Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 9422db40
...@@ -892,13 +892,13 @@ static void __devinit snd_mts64_attach(struct parport *p) ...@@ -892,13 +892,13 @@ static void __devinit snd_mts64_attach(struct parport *p)
struct platform_device *device; struct platform_device *device;
device = platform_device_alloc(PLATFORM_DRIVER, device_count); device = platform_device_alloc(PLATFORM_DRIVER, device_count);
if (!device) if (!device)
return; return;
/* Temporary assignment to forward the parport */ /* Temporary assignment to forward the parport */
platform_set_drvdata(device, p); platform_set_drvdata(device, p);
if (platform_device_register(device) < 0) { if (platform_device_add(device) < 0) {
platform_device_put(device); platform_device_put(device);
return; return;
} }
......
...@@ -676,13 +676,13 @@ static void __devinit snd_portman_attach(struct parport *p) ...@@ -676,13 +676,13 @@ static void __devinit snd_portman_attach(struct parport *p)
struct platform_device *device; struct platform_device *device;
device = platform_device_alloc(PLATFORM_DRIVER, device_count); device = platform_device_alloc(PLATFORM_DRIVER, device_count);
if (!device) if (!device)
return; return;
/* Temporary assignment to forward the parport */ /* Temporary assignment to forward the parport */
platform_set_drvdata(device, p); platform_set_drvdata(device, p);
if (platform_device_register(device) < 0) { if (platform_device_add(device) < 0) {
platform_device_put(device); platform_device_put(device);
return; return;
} }
......
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