From 12f817579be06b2b5d4b68830ca35af3dd4d6257 Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Wed, 11 Jul 2012 15:49:34 +0200 Subject: [PATCH] --- yaml --- r: 317970 b: refs/heads/master c: 4102d9f86d4d88f2bf150f3d073b789f35c9ac6b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 133c1f5a3c03..6d46d2edd2f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95c59dc96d361d15e0ca1fa6b753cdd8f3ebabec +refs/heads/master: 4102d9f86d4d88f2bf150f3d073b789f35c9ac6b diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c index 9afafaae3c58..4287a80b7388 100644 --- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c @@ -764,7 +764,7 @@ static inline void sm7xx_init_hw(void) */ static int __init sm712vga_setup(char *options) { - int index; + int i; if (!options || !*options) return -EINVAL; @@ -775,16 +775,14 @@ static int __init sm712vga_setup(char *options) pr_debug("sm712vga_setup = %s\n", options); - for (index = 0; - index < ARRAY_SIZE(vesa_mode_table); - index++) { - if (strstr(options, vesa_mode_table[index].index)) { + for (i = 0; i < ARRAY_SIZE(vesa_mode_table); i++) { + if (strstr(options, vesa_mode_table[i].index)) { smtc_screen_info.lfb_width = - vesa_mode_table[index].lfb_width; + vesa_mode_table[i].lfb_width; smtc_screen_info.lfb_height = - vesa_mode_table[index].lfb_height; + vesa_mode_table[i].lfb_height; smtc_screen_info.lfb_depth = - vesa_mode_table[index].lfb_depth; + vesa_mode_table[i].lfb_depth; return 0; } }