diff options
Diffstat (limited to 'drivers/staging/media/omap24xx/tcm825x.c')
| -rw-r--r-- | drivers/staging/media/omap24xx/tcm825x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/media/omap24xx/tcm825x.c b/drivers/staging/media/omap24xx/tcm825x.c index 3367ccd1d1e8..6a1f47995a17 100644 --- a/drivers/staging/media/omap24xx/tcm825x.c +++ b/drivers/staging/media/omap24xx/tcm825x.c @@ -542,6 +542,7 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s, /* exposure time is special, spread across 2 registers */ if (vc->id == V4L2_CID_EXPOSURE) { int val_lower, val_upper; + val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L); val_upper = (val >> 8) & TCM825X_MASK(TCM825X_ESRSPD_U); @@ -750,7 +751,7 @@ static int ioctl_g_ifparm(struct v4l2_int_device *s, struct v4l2_ifparm *p) (2457 * tgt_fps) / MAX_FPS; tgt_xclk *= 10000; - tgt_xclk = min(tgt_xclk, (u32)TCM825X_XCLK_MAX); + tgt_xclk = min_t(u32, tgt_xclk, TCM825X_XCLK_MAX); tgt_xclk = max(tgt_xclk, (u32)TCM825X_XCLK_MIN); p->u.bt656.clock_curr = tgt_xclk; |