Commit 775b048d authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] cyblafb: portability fixes, sanitized work with pointers 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarKnut Petersen <Knut_Petersen@t-online.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87e0f3db

drivers/video/cyblafb.c

+6 −5
Original line number Diff line number Diff line
@@ -410,20 +410,21 @@ static void cyblafb_imageblit(struct fb_info *info, 
	out32(GE0C,point(image->dx+image->width-1,image->dy+image->height-1));



	while(index < index_end) {

		const char *p = image->data + index;

		for(i=0;i<width_dds;i++) {

			out32(GE9C,*((u32*) ((u32)image->data + index)));

			out32(GE9C,*(u32*)p);

			p+=4;

			index+=4;

		}

		switch(width_dbs) {

		case 0: break;

		case 8:	out32(GE9C,*((u8*)((u32)image->data+index)));

		case 8:	out32(GE9C,*(u8*)p);

			index+=1;

			break;

		case 16: out32(GE9C,*((u16*)((u32)image->data+index)));

		case 16: out32(GE9C,*(u16*)p);

			index+=2;

			break;

		case 24: out32(GE9C,(u32)(*((u16*)((u32)image->data+index))) |

			       (u32)(*((u8*)((u32)image->data+index+2)))<<16);

		case 24: out32(GE9C,*(u16*)p | *(u8*)(p+2)<<16);

			index+=3;

			break;

		}