---

yaml --- r: 349095 b: refs/heads/master c: afc1030 h: refs/heads/master i: 349093: 963ab82 349091: 0ed99bb 349087: a37fda8 v: v3
git-mirror · Jan 14, 2013 · 5008b19 · 5008b19
1 parent d9dd8bf
commit 5008b19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 006e792ba5f60c59d8bc5ac5628c54e021e8580f
+refs/heads/master: afc10301f70350b490ca518ceb793928854b5453
diff --git a/trunk/drivers/video/imxfb.c b/trunk/drivers/video/imxfb.c
@@ -729,6 +729,8 @@ static int __init imxfb_init_fbinfo(struct platform_device *pdev)
 
 	memset(fbi, 0, sizeof(struct imxfb_info));
 
+	fbi->devtype = pdev->id_entry->driver_data;
+
 	strlcpy(info->fix.id, IMX_NAME, sizeof(info->fix.id));
 
 	info->fix.type			= FB_TYPE_PACKED_PIXELS;
@@ -789,7 +791,6 @@ static int __init imxfb_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	fbi = info->par;
-	fbi->devtype = pdev->id_entry->driver_data;
 
 	if (!fb_mode)
 		fb_mode = pdata->mode[0].mode.name;