From 6fa5bebcead8f1e8c065e13c9e49806640895819 Mon Sep 17 00:00:00 2001 From: "Javier M. Mellid" Date: Wed, 27 Jun 2012 14:10:15 +0200 Subject: [PATCH] --- yaml --- r: 317731 b: refs/heads/master c: 501b02e4d6a3c29ce4e7cef9a5a1a21f236c3c63 h: refs/heads/master i: 317729: b2ef754a94398f715767ab38e5fdb76657637787 317727: d1cc9efe577ed5e5a9af5b83d3ca2a3f53c1fc52 v: v3 --- [refs] | 2 +- trunk/drivers/staging/sm7xxfb/sm7xxfb.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 63bfd71ea62b..8514edbff0ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7813296d2259dd5056278bcf8b2fdeaaf8499f1f +refs/heads/master: 501b02e4d6a3c29ce4e7cef9a5a1a21f236c3c63 diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c index c603e8c2c360..e3511ecd0980 100644 --- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c +++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c @@ -40,8 +40,8 @@ struct screen_info smtc_screen_info; * Private structure */ struct smtcfb_info { - struct fb_info fb; struct pci_dev *pdev; + struct fb_info fb; u16 chip_id; u8 chip_rev_id; @@ -328,9 +328,11 @@ static int smtc_blank(int blank_mode, struct fb_info *info) static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, unsigned trans, struct fb_info *info) { - struct smtcfb_info *sfb = (struct smtcfb_info *)info; + struct smtcfb_info *sfb; u32 val; + sfb = info->par; + if (regno > 255) return 1; @@ -623,9 +625,7 @@ static int smtc_check_var(struct fb_var_screeninfo *var, struct fb_info *info) static int smtc_set_par(struct fb_info *info) { - struct smtcfb_info *sfb = (struct smtcfb_info *)info; - - smtcfb_setmode(sfb); + smtcfb_setmode(info->par); return 0; }