media: vivid: fix incorrect PA assignment to HDMI outputs
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Fri, 20 Mar 2020 11:13:37 +0000 (12:13 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 24 Mar 2020 16:06:24 +0000 (17:06 +0100)
The initial physical address was one too low for the outputs.
E.g. if 1.0.0.0 was expected, then it was set to 0.0.0.0, and
2.0.0.0 became 1.0.0.0.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Cc: Johan Korsnes <johan.korsnes@gmail.com>
Fixes: 4ee895e71abb ("media: vivid: reorder CEC allocation and control set-up")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/platform/vivid/vivid-core.c

index c62c068..6c740e3 100644 (file)
@@ -1571,8 +1571,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
                        }
                        v4l2_info(&dev->v4l2_dev, "CEC adapter %s registered for HDMI output %d\n",
                                  dev_name(&dev->cec_tx_adap[i]->devnode.dev), i);
-                       if (i <= out_type_counter[HDMI])
-                               cec_s_phys_addr(dev->cec_tx_adap[i], i << 12, false);
+                       if (i < out_type_counter[HDMI])
+                               cec_s_phys_addr(dev->cec_tx_adap[i], (i + 1) << 12, false);
                        else
                                cec_s_phys_addr(dev->cec_tx_adap[i], 0x1000, false);
                }