renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-09 22:24:04 +08:00
Code

media: si2157: fix 6MHz & 6.1MHz bandwidth setting

Browse Source 
Commit 98c65a3dac ("media: si2157: add support for 1.7MHz and 6.1
MHz") introduced two bugs: The 6.1MHz setting was always used for any
bandwidth less than 7MHz due to missing "else" keywords, and then the
setting was not specified as decimal 10, but as hexadecimal 0x10, which
makes the tuner refuse the tune command. In sum, it is not possible to
tune to any channels of less than 7MHz bandwidth anymore.

Add the missing "else" keywords and convert all bandwidth settings to
decimal to avoid any future decimal vs. hexadecimal confusion.

Remove the use of the undefined bandwidth setting 0x0f for bandwidths
greater than 8MHz, which is also refused by the tune command, in favour
of using the default bandwidth setting 8 for any bandwidths greater than
7MHz.

Link: https://lore.kernel.org/linux-media/trinity-d0015ea1-1da5-4c7d-a75b-781fb26dc339-1641509387112@3c-app-gmx-bap68
Fixes: 98c65a3dac ("media: si2157: add support for 1.7MHz and 6.1 MHz")
Reported-by: Robert Schlabbach <robert_s@gmx.net>
Signed-off-by: Robert Schlabbach <robert_s@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Robert Schlabbach 2022-01-06 23:49:47 +01:00 committed by Mauro Carvalho Chehab
parent a89eeb9937
commit 95c4cd1d19
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/tuners/si2157.c
View File

@ -459,17 +459,15 @@ static int si2157_set_params(struct dvb_frontend *fe)
}
if (SUPPORTS_1700KHz(dev) && c->bandwidth_hz <= 1700000)
bandwidth = 0x09;
if (c->bandwidth_hz <= 6000000)
bandwidth = 0x06;
if (SUPPORTS_1700KHz(dev) && c->bandwidth_hz <= 6100000)
bandwidth = 0x10;
bandwidth = 9;
else if (c->bandwidth_hz <= 6000000)
bandwidth = 6;
else if (SUPPORTS_1700KHz(dev) && c->bandwidth_hz <= 6100000)
bandwidth = 10;
else if (c->bandwidth_hz <= 7000000)
bandwidth = 0x07;
else if (c->bandwidth_hz <= 8000000)
bandwidth = 0x08;
bandwidth = 7;
else
bandwidth = 0x0f;
bandwidth = 8;
switch (c->delivery_system) {
case SYS_ATSC: