Merge "msm: sde: Reject 0 size image for SDE rotator"

This commit is contained in:
Linux Build Service Account 2016-10-07 22:15:44 -07:00 committed by Gerrit - the friendly Code Review server
commit dc9ba857fb

View file

@ -1123,6 +1123,13 @@ static int sde_rotator_try_fmt_vid_cap(struct file *file,
struct sde_rotation_config config;
int ret;
if ((f->fmt.pix.width == 0) || (f->fmt.pix.height == 0)) {
SDEDEV_WARN(ctx->rot_dev->dev,
"Not supporting 0 width/height: %dx%d\n",
f->fmt.pix.width, f->fmt.pix.height);
return -EINVAL;
}
sde_rot_mgr_lock(rot_dev->mgr);
sde_rotator_get_config_from_ctx(ctx, &config);
config.output.format = f->fmt.pix.pixelformat;
@ -1162,6 +1169,13 @@ static int sde_rotator_try_fmt_vid_out(struct file *file,
struct sde_rotation_config config;
int ret;
if ((f->fmt.pix.width == 0) || (f->fmt.pix.height == 0)) {
SDEDEV_WARN(ctx->rot_dev->dev,
"Not supporting 0 width/height: %dx%d\n",
f->fmt.pix.width, f->fmt.pix.height);
return -EINVAL;
}
sde_rot_mgr_lock(rot_dev->mgr);
sde_rotator_get_config_from_ctx(ctx, &config);
config.input.format = f->fmt.pix.pixelformat;