@@ -367,6 +367,7 @@ struct cirrusfb_info {
};
static bool noaccel;
+static char *mode_option_buf;
static char *mode_option = "640x480@60";
/****************************************************************************/
@@ -2336,10 +2337,13 @@ static int __init cirrusfb_setup(char *options)
if (!strcmp(this_opt, "noaccel"))
noaccel = 1;
- else if (!strncmp(this_opt, "mode:", 5))
- mode_option = this_opt + 5;
- else
- mode_option = this_opt;
+ else {
+ if (!strncmp(this_opt, "mode:", 5))
+ this_opt += 5;
+ kfree(mode_option_buf);
+ mode_option_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors
+ mode_option = mode_option_buf;
+ }
}
return 0;
}
@@ -2387,6 +2391,7 @@ static void __exit cirrusfb_exit(void)
#ifdef CONFIG_ZORRO
zorro_unregister_driver(&cirrusfb_zorro_driver);
#endif
+ kfree(mode_option_buf);
}
module_init(cirrusfb_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/cirrusfb.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)