[ARM] pxa: avoid kfreeing static data if platform device fails to register

When a dynamically allocated platform device is 'put', the platform
device's platform_data is kfree'd.  This is bad if it's pointing at
static data.  Use the provided function to register platform data
for these devices.

This also means we can mark the pcmcia ops structures as __initdata.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2008-04-24 15:28:11 +01:00 коммит произвёл Russell King
Родитель 04ba0f656f
Коммит 4e5e8de0db
3 изменённых файлов: 19 добавлений и 13 удалений

Просмотреть файл

@ -131,7 +131,7 @@ static void cmx270_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
} }
static struct pcmcia_low_level cmx270_pcmcia_ops = { static struct pcmcia_low_level cmx270_pcmcia_ops __initdata = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = cmx270_pcmcia_hw_init, .hw_init = cmx270_pcmcia_hw_init,
.hw_shutdown = cmx270_pcmcia_shutdown, .hw_shutdown = cmx270_pcmcia_shutdown,
@ -156,10 +156,13 @@ static int __init cmx270_pcmcia_init(void)
if (!cmx270_pcmcia_device) if (!cmx270_pcmcia_device)
return -ENOMEM; return -ENOMEM;
cmx270_pcmcia_device->dev.platform_data = &cmx270_pcmcia_ops; ret = platform_device_add_data(cmx270_pcmcia_device, &cmx270_pcmcia_ops,
sizeof(cmx270_pcmcia_ops));
printk(KERN_INFO "Registering cm-x270 PCMCIA interface.\n"); if (ret == 0) {
ret = platform_device_add(cmx270_pcmcia_device); printk(KERN_INFO "Registering cm-x270 PCMCIA interface.\n");
ret = platform_device_add(cmx270_pcmcia_device);
}
if (ret) if (ret)
platform_device_put(cmx270_pcmcia_device); platform_device_put(cmx270_pcmcia_device);

Просмотреть файл

@ -137,7 +137,7 @@ static void mst_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
{ {
} }
static struct pcmcia_low_level mst_pcmcia_ops = { static struct pcmcia_low_level mst_pcmcia_ops __initdata = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = mst_pcmcia_hw_init, .hw_init = mst_pcmcia_hw_init,
.hw_shutdown = mst_pcmcia_hw_shutdown, .hw_shutdown = mst_pcmcia_hw_shutdown,
@ -161,9 +161,10 @@ static int __init mst_pcmcia_init(void)
if (!mst_pcmcia_device) if (!mst_pcmcia_device)
return -ENOMEM; return -ENOMEM;
mst_pcmcia_device->dev.platform_data = &mst_pcmcia_ops; ret = platform_device_add_data(mst_pcmcia_device, &mst_pcmcia_ops,
sizeof(mst_pcmcia_ops));
ret = platform_device_add(mst_pcmcia_device); if (ret == 0)
ret = platform_device_add(mst_pcmcia_device);
if (ret) if (ret)
platform_device_put(mst_pcmcia_device); platform_device_put(mst_pcmcia_device);

Просмотреть файл

@ -222,7 +222,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
sharpsl_pcmcia_init_reset(skt); sharpsl_pcmcia_init_reset(skt);
} }
static struct pcmcia_low_level sharpsl_pcmcia_ops = { static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hw_init = sharpsl_pcmcia_hw_init, .hw_init = sharpsl_pcmcia_hw_init,
.hw_shutdown = sharpsl_pcmcia_hw_shutdown, .hw_shutdown = sharpsl_pcmcia_hw_shutdown,
@ -261,10 +261,12 @@ static int __init sharpsl_pcmcia_init(void)
if (!sharpsl_pcmcia_device) if (!sharpsl_pcmcia_device)
return -ENOMEM; return -ENOMEM;
sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops; ret = platform_device_add_data(sharpsl_pcmcia_device,
sharpsl_pcmcia_device->dev.parent = platform_scoop_config->devs[0].dev; &sharpsl_pcmcia_ops, sizeof(sharpsl_pcmcia_ops));
if (ret == 0) {
ret = platform_device_add(sharpsl_pcmcia_device); sharpsl_pcmcia_device->dev.parent = platform_scoop_config->devs[0].dev;
ret = platform_device_add(sharpsl_pcmcia_device);
}
if (ret) if (ret)
platform_device_put(sharpsl_pcmcia_device); platform_device_put(sharpsl_pcmcia_device);