tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

V4L/DVB (9468): Miscellaneous fixes

- Fix a bitfield
- Set gain appropriately
- Slept for the wrong duration

Signed-off-by: Reinhard Nissl <rnissl@gmx.de>
Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by

Reinhard Nissl and committed by
Mauro Carvalho Chehab 9bb17eee c615a27a

+6 -6
+1 -1
drivers/media/dvb/frontends/stb0899_reg.h
··· 362 362 363 363 #define STB0899_OFF0_CRL_FREQ 0xf304 364 364 #define STB0899_BASE_CRL_FREQ 0x00000000 365 - #define STB0899_CARR_FREQ (0x1fffffff << 0) 365 + #define STB0899_CARR_FREQ (0x3fffffff << 0) 366 366 #define STB0899_OFFST_CARR_FREQ 0 367 367 #define STB0899_WIDTH_CARR_FREQ 30 368 368
+5 -5
drivers/media/dvb/frontends/stb6100.c
··· 338 338 339 339 /* Baseband gain. */ 340 340 if (srate >= 15000000) 341 - g = 8; 342 - else if (state->srate >= 5000000) 343 - g = 12; 341 + g = 9; // +4 dB 342 + else if (srate >= 5000000) 343 + g = 11; // +8 dB 344 344 else 345 - g = 14; 345 + g = 14; // +14 dB 346 346 347 347 regs[STB6100_G] = (regs[STB6100_G] & ~STB6100_G_G) | g; 348 348 regs[STB6100_G] &= ~STB6100_G_GCT; /* mask GCT */ ··· 403 403 if ((rc = stb6100_write_reg(state, STB6100_VCO, regs[STB6100_VCO])) < 0) 404 404 return rc; 405 405 406 - msleep(5); /* wait for LO to lock */ 406 + msleep(10); /* wait for LO to lock */ 407 407 regs[STB6100_VCO] &= ~STB6100_VCO_OSCH; /* vco search disabled */ 408 408 regs[STB6100_VCO] |= STB6100_VCO_OCK; /* search clock off */ 409 409 if ((rc = stb6100_write_reg(state, STB6100_VCO, regs[STB6100_VCO])) < 0)