media: vivid: fix incorrect HDMI input/output CEC logging

Only the first HDMI input has a CEC adapter, so just report 'HDMI 0' as
the HDMI input name.

For the HDMI outputs use bus_cnt instead of i as the output number.
The HDMI name now corresponds to what 'v4l2-ctl --list-outputs' reports.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index ef344b9a48afb22fd7072295b43b8e027b82a3d7..5f316a5e38dbe061d14fda0da3c321046327c439 100644 (file)
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -1201,8 +1201,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
                                goto unreg_dev;
                        }
                        cec_s_phys_addr(adap, 0, false);
-                       v4l2_info(&dev->v4l2_dev, "CEC adapter %s registered for HDMI input %d\n",
-                                 dev_name(&adap->devnode.dev), i);
+                       v4l2_info(&dev->v4l2_dev, "CEC adapter %s registered for HDMI input 0\n",
+                                 dev_name(&adap->devnode.dev));
                }
 #endif
 
@@ -1255,13 +1255,13 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
                                dev->cec_tx_adap[bus_cnt] = NULL;
                                goto unreg_dev;
                        }
+                       v4l2_info(&dev->v4l2_dev, "CEC adapter %s registered for HDMI output %d\n",
+                                 dev_name(&adap->devnode.dev), bus_cnt);
                        bus_cnt++;
                        if (bus_cnt <= out_type_counter[HDMI])
                                cec_s_phys_addr(adap, bus_cnt << 12, false);
                        else
                                cec_s_phys_addr(adap, 0x1000, false);
-                       v4l2_info(&dev->v4l2_dev, "CEC adapter %s registered for HDMI output %d\n",
-                                 dev_name(&adap->devnode.dev), i);
                }
 #endif