@@ -47,6 +47,7 @@
#define OCFB_NAME "OC VGA/LCD"
+static char *mode_option_buf;
static char *mode_option;
static const struct fb_videomode default_mode = {
@@ -77,7 +78,10 @@ static int __init ocfb_setup(char *options)
while ((curr_opt = strsep(&options, ",")) != NULL) {
if (!*curr_opt)
continue;
- mode_option = curr_opt;
+
+ kfree(mode_option_buf);
+ mode_option_buf = kstrdup(curr_opt, GFP_KERNEL); // ignore errors
+ mode_option = mode_option_buf;
}
return 0;
@@ -420,6 +424,7 @@ static int __init ocfb_init(void)
static void __exit ocfb_exit(void)
{
platform_driver_unregister(&ocfb_driver);
+ kfree(mode_option_buf);
}
module_init(ocfb_init);
Assume that the driver does not own the option string or its substrings and hence duplicate the option string for the video mode. Allocate the copy's memory with kstrdup() and free it in the module's exit function. Done in preparation of switching the driver to struct option_iter and constifying the option string. v2: * replace static memory with kstrdup()/kfree() (Geert) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/video/fbdev/ocfb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)