diff options
| author | Mark Brown <broonie@kernel.org> | 2018-04-06 10:27:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-06 10:27:48 +0100 |
| commit | 811d9e22fa74cbe287d168f21f83b16d52f4eb55 (patch) | |
| tree | b15de2a4a1d0e1eb1d46719c169d56a09f8e5d18 /drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c | |
| parent | 7cfac701d454aee02660aa0ae6febd03c1240904 (diff) | |
| parent | 2255a9334a3a3947b929d58af4f0c8ab31847a6a (diff) | |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rt
Diffstat (limited to 'drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c')
| -rw-r--r-- | drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c index 59280ac31937..23d0cedf4d9d 100644 --- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c +++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c @@ -83,7 +83,7 @@ static void c8sectpfe_timer_interrupt(unsigned long ac8sectpfei) static void channel_swdemux_tsklet(unsigned long data) { struct channel_info *channel = (struct channel_info *)data; - struct c8sectpfei *fei = channel->fei; + struct c8sectpfei *fei; unsigned long wp, rp; int pos, num_packets, n, size; u8 *buf; @@ -91,6 +91,8 @@ static void channel_swdemux_tsklet(unsigned long data) if (unlikely(!channel || !channel->irec)) return; + fei = channel->fei; + wp = readl(channel->irec + DMA_PRDS_BUSWP_TP(0)); rp = readl(channel->irec + DMA_PRDS_BUSRP_TP(0)); |