@@ -779,12 +779,28 @@ static struct pci_driver gxt4500_driver = {
static int gxt4500_init(void)
{
+#ifndef MODULE
+ char *options;
+#endif
+
if (fb_modesetting_disabled("gxt4500"))
return -ENODEV;
#ifndef MODULE
- if (fb_get_options("gxt4500", &mode_option))
+ if (fb_get_options("gxt4500", &options))
return -ENODEV;
+
+ do {
+ static char mode_option_buf[256];
+ int ret;
+
+ ret = snprintf(mode_option_buf, sizeof(mode_option_buf), "%s", options);
+ if (WARN(ret < 0, "gxt4500: ignoring invalid option, ret=%d\n", ret))
+ break;
+ if (WARN(ret >= sizeof(mode_option_buf), "gxt4500: option too long\n"))
+ break;
+ mode_option = mode_option_buf;
+ } while (0);
#endif
return pci_register_driver(&gxt4500_driver);
Assume that the driver does not own the option string or its substrings and hence duplicate the option string for the video mode. The driver only parses the option string once as part of module initialization, so use a static buffer to store the duplicated mode option. Linux automatically frees the memory upon releasing the module. Done in preparation of constifying the option string. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/video/fbdev/gxt4500.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)