From d98d6bf463c3fc5a8c26f29a972cca633a55b6c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Tue, 20 Mar 2012 16:46:20 +0200 Subject: [PATCH] gfx: drv: Correctly set info->par MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When using drm_fb_helper, fbdev par is supposed to point to the drm_fb_helper instance. This "bug" didn't cause problems as the helper is emedded as the first member inside the psb_fbdev strcture. But let's make the code correct nonetheless. Signed-off-by: Ville Syrjälä Signed-off-by: Kirill A. Shutemov --- drivers/staging/mrst/drv/psb_fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/mrst/drv/psb_fb.c b/drivers/staging/mrst/drv/psb_fb.c index 789f25b..a7f79df 100644 --- a/drivers/staging/mrst/drv/psb_fb.c +++ b/drivers/staging/mrst/drv/psb_fb.c @@ -68,8 +68,8 @@ static int psbfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, unsigned transp, struct fb_info *info) { - struct psb_fbdev * fbdev = info->par; - struct drm_framebuffer *fb = fbdev->psb_fb_helper.fb; + struct drm_fb_helper *fb_helper = info->par; + struct drm_framebuffer *fb = fb_helper->fb; uint32_t v; if (!fb) @@ -422,7 +422,7 @@ static int psbfb_create(struct psb_fbdev * fbdev, struct drm_fb_helper_surface_s goto out_err1; } - info->par = fbdev; + info->par = &fbdev->psb_fb_helper; psbfb->fbdev = info; -- 2.7.4