Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[linux.git] / drivers / video / fbdev / stifb.c

diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c
index cfe8a2f905c588a39419093b22fa8cb04b060e1e..86621fabbb8b3105a9b8e404e6c18b2f3830347d 100644 (file)
--- a/drivers/video/fbdev/stifb.c
+++ b/drivers/video/fbdev/stifb.c
@@ -918,7 +918,7 @@ static int
 stifb_setcolreg(u_int regno, u_int red, u_int green,
              u_int blue, u_int transp, struct fb_info *info)
 {
-       struct stifb_info *fb = (struct stifb_info *) info;
+       struct stifb_info *fb = container_of(info, struct stifb_info, info);
        u32 color;
 
        if (regno >= NR_PALETTE)
@@ -978,7 +978,7 @@ stifb_setcolreg(u_int regno, u_int red, u_int green,
 static int
 stifb_blank(int blank_mode, struct fb_info *info)
 {
-       struct stifb_info *fb = (struct stifb_info *) info;
+       struct stifb_info *fb = container_of(info, struct stifb_info, info);
        int enable = (blank_mode == 0) ? ENABLE : DISABLE;
 
        switch (fb->id) {