| From 1838991c1d4d17a8ea2202de23fc2210952b2968 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Aug 2019 19:05:55 -0300 |
| Subject: media: saa7134: fix terminology around |
| saa7134_i2c_eeprom_md7134_gate() |
| |
| From: Maciej S. Szmigiero <mail@maciej.szmigiero.name> |
| |
| [ Upstream commit 9d802222a3405599d6e1984d9324cddf592ea1f4 ] |
| |
| saa7134_i2c_eeprom_md7134_gate() function and the associated comment uses |
| an inverted i2c gate open / closed terminology. |
| Let's fix this. |
| |
| Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> |
| Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> |
| [hverkuil-cisco@xs4all.nl: fix alignment checkpatch warning] |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/pci/saa7134/saa7134-i2c.c | 12 ++++++++---- |
| 1 file changed, 8 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/media/pci/saa7134/saa7134-i2c.c b/drivers/media/pci/saa7134/saa7134-i2c.c |
| index dca0592c5f471..6f93568f56204 100644 |
| --- a/drivers/media/pci/saa7134/saa7134-i2c.c |
| +++ b/drivers/media/pci/saa7134/saa7134-i2c.c |
| @@ -355,7 +355,11 @@ static struct i2c_client saa7134_client_template = { |
| |
| /* ----------------------------------------------------------- */ |
| |
| -/* On Medion 7134 reading EEPROM needs DVB-T demod i2c gate open */ |
| +/* |
| + * On Medion 7134 reading the SAA7134 chip config EEPROM needs DVB-T |
| + * demod i2c gate closed due to an address clash between this EEPROM |
| + * and the demod one. |
| + */ |
| static void saa7134_i2c_eeprom_md7134_gate(struct saa7134_dev *dev) |
| { |
| u8 subaddr = 0x7, dmdregval; |
| @@ -372,14 +376,14 @@ static void saa7134_i2c_eeprom_md7134_gate(struct saa7134_dev *dev) |
| |
| ret = i2c_transfer(&dev->i2c_adap, i2cgatemsg_r, 2); |
| if ((ret == 2) && (dmdregval & 0x2)) { |
| - pr_debug("%s: DVB-T demod i2c gate was left closed\n", |
| + pr_debug("%s: DVB-T demod i2c gate was left open\n", |
| dev->name); |
| |
| data[0] = subaddr; |
| data[1] = (dmdregval & ~0x2); |
| if (i2c_transfer(&dev->i2c_adap, i2cgatemsg_w, 1) != 1) |
| - pr_err("%s: EEPROM i2c gate open failure\n", |
| - dev->name); |
| + pr_err("%s: EEPROM i2c gate close failure\n", |
| + dev->name); |
| } |
| } |
| |
| -- |
| 2.20.1 |
| |
