diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2017-07-15 18:47:40 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-07-18 13:00:52 -0300 |
| commit | 0e6fd95802e25b2428749703f76ea9d54ea743a3 (patch) | |
| tree | f56b78533c82b5e9a8601046d8a4febeca914294 /drivers/media | |
| parent | ed10b4e0870b446c0e8e089b287be21ccdbcf5d6 (diff) | |
| download | talos-obmc-linux-0e6fd95802e25b2428749703f76ea9d54ea743a3.tar.gz talos-obmc-linux-0e6fd95802e25b2428749703f76ea9d54ea743a3.zip | |
media: pulse8-cec/rainshadow-cec: make adapter name unique
The CEC adapter name used by the pulse8-cec and rainshadow-cec USB device drivers
was a fixed string, but it should be unique if you connect multiple of these devices
to the same computer.
Use dev_name(&serio->dev) instead, which make it unique again.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/usb/pulse8-cec/pulse8-cec.c | 2 | ||||
| -rw-r--r-- | drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/pulse8-cec/pulse8-cec.c b/drivers/media/usb/pulse8-cec/pulse8-cec.c index c843070f24c1..e29d43237046 100644 --- a/drivers/media/usb/pulse8-cec/pulse8-cec.c +++ b/drivers/media/usb/pulse8-cec/pulse8-cec.c @@ -656,7 +656,7 @@ static int pulse8_connect(struct serio *serio, struct serio_driver *drv) pulse8->serio = serio; pulse8->adap = cec_allocate_adapter(&pulse8_cec_adap_ops, pulse8, - "HDMI CEC", caps, 1); + dev_name(&serio->dev), caps, 1); err = PTR_ERR_OR_ZERO(pulse8->adap); if (err < 0) goto free_device; diff --git a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c index 65692576690f..30bff4c48f92 100644 --- a/drivers/media/usb/rainshadow-cec/rainshadow-cec.c +++ b/drivers/media/usb/rainshadow-cec/rainshadow-cec.c @@ -323,7 +323,7 @@ static int rain_connect(struct serio *serio, struct serio_driver *drv) rain->serio = serio; rain->adap = cec_allocate_adapter(&rain_cec_adap_ops, rain, - "HDMI CEC", caps, 1); + dev_name(&serio->dev), caps, 1); err = PTR_ERR_OR_ZERO(rain->adap); if (err < 0) goto free_device; |
