From 5008b19587c0dfc6db64406b8fba6fb04b68126f Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Sun, 13 Jan 2013 16:56:43 +0100 Subject: [PATCH] --- yaml --- r: 349095 b: refs/heads/master c: afc10301f70350b490ca518ceb793928854b5453 h: refs/heads/master i: 349093: 963ab82d3a73d8e3d27e202dcb1f72b252adfe52 349091: 0ed99bbf019f84eafee611e31a867dde9b9b4fd1 349087: a37fda8630033765fd2ca77bb264e1d10fa60b3d v: v3 --- [refs] | 2 +- trunk/drivers/video/imxfb.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4767a6b313f6..4115527519de 100644 --- 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 index e501dbc966b3..8435c5d601a1 100644 --- 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;