[PATCH] vesafb: Update platform code
Update platform code to dynamically allocate the platform device Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
673681c1b5
commit
103edf024b
|
@ -460,9 +460,7 @@ static struct platform_driver vesafb_driver = {
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct platform_device vesafb_device = {
|
static struct platform_device *vesafb_device;
|
||||||
.name = "vesafb",
|
|
||||||
};
|
|
||||||
|
|
||||||
static int __init vesafb_init(void)
|
static int __init vesafb_init(void)
|
||||||
{
|
{
|
||||||
|
@ -475,10 +473,19 @@ static int __init vesafb_init(void)
|
||||||
ret = platform_driver_register(&vesafb_driver);
|
ret = platform_driver_register(&vesafb_driver);
|
||||||
|
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
ret = platform_device_register(&vesafb_device);
|
vesafb_device = platform_device_alloc("vesafb", 0);
|
||||||
if (ret)
|
|
||||||
|
if (vesafb_device)
|
||||||
|
ret = platform_device_add(vesafb_device);
|
||||||
|
else
|
||||||
|
ret = -ENOMEM;
|
||||||
|
|
||||||
|
if (ret) {
|
||||||
|
platform_device_put(vesafb_device);
|
||||||
platform_driver_unregister(&vesafb_driver);
|
platform_driver_unregister(&vesafb_driver);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
module_init(vesafb_init);
|
module_init(vesafb_init);
|
||||||
|
|
Loading…
Reference in New Issue