Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317970
b: refs/heads/master
c: 4102d9f
h: refs/heads/master
v: v3
  • Loading branch information
Javier M. Mellid authored and Greg Kroah-Hartman committed Jul 17, 2012
1 parent cbcea5e commit 12f8175
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 95c59dc96d361d15e0ca1fa6b753cdd8f3ebabec
refs/heads/master: 4102d9f86d4d88f2bf150f3d073b789f35c9ac6b
14 changes: 6 additions & 8 deletions trunk/drivers/staging/sm7xxfb/sm7xxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
}
Expand Down

0 comments on commit 12f8175

Please sign in to comment.