---

yaml --- r: 154903 b: refs/heads/master c: cbad1cb h: refs/heads/master i: 154901: 4e403ff 154899: 6f12784 154895: 3aa02e9 v: v3
git-mirror · Jul 6, 2009 · de8b08e · de8b08e
1 parent 2a9fdab
commit de8b08e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e4a718ff38d8539938ec3421935904c27e00c39
+refs/heads/master: cbad1cbb51d92c0b5c3f47ef9dbf125de81fae08
diff --git a/trunk/drivers/video/sis/sis_main.c b/trunk/drivers/video/sis/sis_main.c
@@ -6367,7 +6367,6 @@ error_3:	vfree(ivideo->bios_abase);
 		sis_fb_info->fix = ivideo->sisfb_fix;
 		sis_fb_info->screen_base = ivideo->video_vbase + ivideo->video_offset;
 		sis_fb_info->fbops = &sisfb_ops;
-		sisfb_get_fix(&sis_fb_info->fix, -1, sis_fb_info);
 		sis_fb_info->pseudo_palette = ivideo->pseudo_palette;
 
 		fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0);