Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / sti / c8sectpfe / c8sectpfe-core.c

diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
index 3a9109356e67dcc8a7ecad71fdad20f836cfe78a..486aef50d99b23e4753cbd055221cd2dbb4f6097 100644 (file)
--- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
+++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -33,6 +33,7 @@
 #include <linux/time.h>
 #include <linux/version.h>
 #include <linux/wait.h>
+#include <linux/pinctrl/pinctrl.h>
 
 #include "c8sectpfe-core.h"
 #include "c8sectpfe-common.h"
@@ -361,7 +362,7 @@ static struct channel_info *find_channel(struct c8sectpfei *fei, int tsin_num)
 {
        int i;
 
-       for (i = 0; i < C8SECTPFE_MAXCHANNEL; i++) {
+       for (i = 0; i < C8SECTPFE_MAX_TSIN_CHAN; i++) {
                if (!fei->channel_data[i])
                        continue;
 
@@ -584,9 +585,9 @@ static int configure_memdma_and_inputblock(struct c8sectpfei *fei,
        writel(tsin->pid_buffer_busaddr,
                fei->io + PIDF_BASE(tsin->tsin_id));
 
-       dev_info(fei->dev, "chan=%d PIDF_BASE=0x%x pid_bus_addr=0x%x\n",
+       dev_info(fei->dev, "chan=%d PIDF_BASE=0x%x pid_bus_addr=%pad\n",
                tsin->tsin_id, readl(fei->io + PIDF_BASE(tsin->tsin_id)),
-               tsin->pid_buffer_busaddr);
+               &tsin->pid_buffer_busaddr);
 
        /* Configure and enable HW PID filtering */