kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] omap_vout: use swap() in omapvid_init()

Browse source 
Use kernel.h macro definition.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Fabian Frederick 2015-05-18 14:54:17 -03:00 committed by Mauro Carvalho Chehab
parent 4aed283c0f
commit cc1821964d
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/platform/omap/omap_vout.c
View file

@ -445,7 +445,7 @@ static int omapvid_init(struct omap_vout_device *vout, u32 addr)
int ret = 0, i; int ret = 0, i;
struct v4l2_window *win; struct v4l2_window *win;
struct omap_overlay *ovl; struct omap_overlay *ovl;
int posx, posy, outw, outh, temp; int posx, posy, outw, outh;
struct omap_video_timings *timing; struct omap_video_timings *timing;
struct omapvideo_info *ovid = &vout->vid_info; struct omapvideo_info *ovid = &vout->vid_info;
@ -468,9 +468,7 @@ static int omapvid_init(struct omap_vout_device *vout, u32 addr)
/* Invert the height and width for 90 /* Invert the height and width for 90
* and 270 degree rotation * and 270 degree rotation
*/ */
temp = outw; swap(outw, outh);
outw = outh;
outh = temp;
posy = (timing->y_res - win->w.width) - win->w.left; posy = (timing->y_res - win->w.width) - win->w.left;
posx = win->w.top; posx = win->w.top;
break; break;
@ -481,9 +479,7 @@ static int omapvid_init(struct omap_vout_device *vout, u32 addr)
break; break;
case dss_rotation_270_degree: case dss_rotation_270_degree:
temp = outw; swap(outw, outh);
outw = outh;
outh = temp;
posy = win->w.left; posy = win->w.left;
posx = (timing->x_res - win->w.height) - win->w.top; posx = (timing->x_res - win->w.height) - win->w.top;
break; break;