diff options
| author | Liu Ying <victor.liu@nxp.com> | 2016-04-27 16:40:45 +0800 |
|---|---|---|
| committer | Liu Ying <victor.liu@nxp.com> | 2016-05-05 10:22:27 +0800 |
| commit | 55f41f794fb96afdb292f3bb2e77014e09b0ef00 (patch) | |
| tree | 66c09ee5524513ad719794d90cac4a974cf81ed8 /drivers/mxc | |
| parent | c1be0c767ff118d568af22b20585825415c12eb6 (diff) | |
MLK-12721 mxc IPUv3: PRE: Correct irq mask in ipu_pre_irq_mask()
We should do bitwise OR operation for all valid irq enable bits to
get the full irq mask. So, to take the bit4(HANDSHAKE_ERROR_IRQ_EN)
into calculation, the mask should be 0x1f instead of 0xf.
Reported-by: Asim Zaidi <asim.zaidi@nxp.com>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/ipu3/pre.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mxc/ipu3/pre.c b/drivers/mxc/ipu3/pre.c index e407ac724f46..5c3459fa9010 100644 --- a/drivers/mxc/ipu3/pre.c +++ b/drivers/mxc/ipu3/pre.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014-2015 Freescale Semiconductor, Inc. + * Copyright (C) 2014-2016 Freescale Semiconductor, Inc. * * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -291,10 +291,10 @@ static void ipu_pre_irq_mask(struct ipu_pre_data *pre, unsigned long mask, bool clear) { if (clear) { - pre_write(pre, mask & 0xf, HW_PRE_IRQ_MASK_CLR); + pre_write(pre, mask & 0x1f, HW_PRE_IRQ_MASK_CLR); return; } - pre_write(pre, mask & 0xf, HW_PRE_IRQ_MASK_SET); + pre_write(pre, mask & 0x1f, HW_PRE_IRQ_MASK_SET); } static int ipu_pre_buf_set(unsigned int id, unsigned long cur_buf, |