From e93eba73424a2750434e7fdea3f87a9df513a91b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 10 Aug 2010 18:02:30 -0700 Subject: [PATCH] --- yaml --- r: 208484 b: refs/heads/master c: a67ef278e24b1fe5ab8f5e8ef27f9654b91732de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9cdfc408a482..7d029b18c1e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26c5be3c750df6f8a9193d478905627ec75f7f41 +refs/heads/master: a67ef278e24b1fe5ab8f5e8ef27f9654b91732de diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 731fce64df9d..a8500c61bb16 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -1786,7 +1786,7 @@ static int ofonly __read_mostly; int fb_get_options(char *name, char **option) { char *opt, *options = NULL; - int opt_len, retval = 0; + int retval = 0; int name_len = strlen(name), i; if (name_len && ofonly && strncmp(name, "offb", 4)) @@ -1796,8 +1796,7 @@ int fb_get_options(char *name, char **option) for (i = 0; i < FB_MAX; i++) { if (video_options[i] == NULL) continue; - opt_len = strlen(video_options[i]); - if (!opt_len) + if (!video_options[i][0]) continue; opt = video_options[i]; if (!strncmp(name, opt, name_len) &&