Skip to content

Commit

Permalink
[PATCH] vesafb: Update platform code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antonino A. Daplas authored and Linus Torvalds committed Jun 26, 2006
1 parent 673681c commit 103edf0
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions drivers/video/vesafb.c
Original file line number Diff line number Diff line change
Expand Up @@ -460,9 +460,7 @@ static struct platform_driver vesafb_driver = {
},
};

static struct platform_device vesafb_device = {
.name = "vesafb",
};
static struct platform_device *vesafb_device;

static int __init vesafb_init(void)
{
Expand All @@ -475,10 +473,19 @@ static int __init vesafb_init(void)
ret = platform_driver_register(&vesafb_driver);

if (!ret) {
ret = platform_device_register(&vesafb_device);
if (ret)
vesafb_device = platform_device_alloc("vesafb", 0);

if (vesafb_device)
ret = platform_device_add(vesafb_device);
else
ret = -ENOMEM;

if (ret) {
platform_device_put(vesafb_device);
platform_driver_unregister(&vesafb_driver);
}
}

return ret;
}
module_init(vesafb_init);
Expand Down

0 comments on commit 103edf0

Please sign in to comment.