@@ -238,6 +238,7 @@ static bool probeonly = 0;
static bool idonly = 0;
static int bailearly = 0;
static int voffset = 48;
+static char *mode_buf;
static char *mode = NULL;
module_param(accel, bool, S_IRUGO);
@@ -365,8 +366,11 @@ static int __init intelfb_setup(char *options)
noinit = !noinit;
else if (OPT_EQUAL(this_opt, "mode="))
mode = get_opt_string(this_opt, "mode=");
- else
- mode = this_opt;
+ else {
+ kfree(mode_buf);
+ mode_buf = kstrdup(this_opt, GFP_KERNEL); // ignore errors
+ mode = mode_buf;
+ }
}
return 0;
@@ -405,6 +409,7 @@ static void __exit intelfb_exit(void)
{
DBG_MSG("intelfb_exit\n");
pci_unregister_driver(&intelfb_driver);
+ kfree(mode_buf);
}
module_init(intelfb_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/intelfb/intelfbdrv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)