---

yaml --- r: 317342 b: refs/heads/master c: 176f784 h: refs/heads/master v: v3
git-mirror · Jun 14, 2012 · 4b7abb8 · 4b7abb8
1 parent f17e130
commit 4b7abb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15d76446205710ddfcba6cc9156c7883074f84b1
+refs/heads/master: 176f7842a8c0a19e0947f630d71bb53db312812f
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1348,6 +1348,8 @@ static int XGIfb_get_fix(struct fb_fix_screeninfo *fix, int con,
 	DEBUGPRN("inside get_fix");
 	memset(fix, 0, sizeof(struct fb_fix_screeninfo));
 
+	strncpy(fix->id, "XGI", sizeof(fix->id) - 1);
+
 	fix->smem_start = xgifb_info->video_base;
 
 	fix->smem_len = xgifb_info->video_size;
@@ -2230,11 +2232,6 @@ static int __devinit xgifb_probe(struct pci_dev *pdev,
 
 	}
 
-	strncpy(fb_info->fix.id, "XGI", sizeof(fb_info->fix.id) - 1);
-	fb_info->fix.type	= FB_TYPE_PACKED_PIXELS;
-	fb_info->fix.xpanstep	= 1;
-	fb_info->fix.ypanstep	= 1;
-
 	fb_info->flags = FBINFO_FLAG_DEFAULT;
 	fb_info->screen_base = xgifb_info->video_vbase;
 	fb_info->fbops = &XGIfb_ops;