Attachment #73186 for bug #112967

Lines 1258-1266 Link Here

(-)drivers/media/video/cx88/cx88-video.c (-2 / +2 lines)
1258		1258
1259	if (video_debug > 1)	1259	if (video_debug > 1)
1260	cx88_print_ioctl(core->name,cmd);	1260	cx88_print_ioctl(core->name,cmd);
1261	printk( KERN_INFO "CORE IOCTL: 0x%x\n", cmd );	1261	/*printk( KERN_INFO "CORE IOCTL: 0x%x\n", cmd );
1262	cx88_print_ioctl(core->name,cmd);	1262	cx88_print_ioctl(core->name,cmd);
1263	dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );	1263	dprintk( 1, "CORE IOCTL: 0x%x\n", cmd );*/
1264		1264
1265	switch (cmd) {	1265	switch (cmd) {
1266	/* ---------- tv norms ---------- */	1266	/* ---------- tv norms ---------- */




	buffer[0] = (div >> 8) & 0x3f;
	buffer[1] = div & 0xff;

	/*if (5 != (rc = i2c_master_send(c, buffer, 5)))
		tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/

	if (tuner_debug) {
		if (5 != (rc = i2c_master_recv(c, buffer, 5)))

	struct tuner *t = i2c_get_clientdata(c);

	memset(buffer, 0, sizeof(buffer));
	/*if (5 != (rc = i2c_master_recv(c, buffer, 5)))
		tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/

	return ((buffer[3] & TEA5767_ADC_LEVEL_MASK) << (13 - 4));
}

	struct tuner *t = i2c_get_clientdata(c);

	memset(buffer, 0, sizeof(buffer));
	/*if (5 != (rc = i2c_master_recv(c, buffer, 5)))
		tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/

	rc = buffer[2] & TEA5767_STEREO_MASK;


		    TEA5767_ST_NOISE_CTL | TEA5767_JAPAN_BAND | TEA5767_STDBY;
	buffer[4] = 0;

	/*if (5 != (rc = i2c_master_send(c, buffer, 5)))
		tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/
}

int tea5767_autodetection(struct i2c_client *c)

Return to bug 112967

Lines 243-250 Link Here

(-)drivers/media/video/tea5767.c (-8 / +8 lines)
243	buffer[0] = (div >> 8) & 0x3f;	243	buffer[0] = (div >> 8) & 0x3f;
244	buffer[1] = div & 0xff;	244	buffer[1] = div & 0xff;
245		245
246	if (5 != (rc = i2c_master_send(c, buffer, 5)))	246	/*if (5 != (rc = i2c_master_send(c, buffer, 5)))
247	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);	247	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/
248		248
249	if (tuner_debug) {	249	if (tuner_debug) {
250	if (5 != (rc = i2c_master_recv(c, buffer, 5)))	250	if (5 != (rc = i2c_master_recv(c, buffer, 5)))
Lines 261-268 Link Here
261	struct tuner *t = i2c_get_clientdata(c);	261	struct tuner *t = i2c_get_clientdata(c);
262		262
263	memset(buffer, 0, sizeof(buffer));	263	memset(buffer, 0, sizeof(buffer));
264	if (5 != (rc = i2c_master_recv(c, buffer, 5)))	264	/*if (5 != (rc = i2c_master_recv(c, buffer, 5)))
265	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);	265	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/
266		266
267	return ((buffer[3] & TEA5767_ADC_LEVEL_MASK) << (13 - 4));	267	return ((buffer[3] & TEA5767_ADC_LEVEL_MASK) << (13 - 4));
268	}	268	}
Lines 274-281 Link Here
274	struct tuner *t = i2c_get_clientdata(c);	274	struct tuner *t = i2c_get_clientdata(c);
275		275
276	memset(buffer, 0, sizeof(buffer));	276	memset(buffer, 0, sizeof(buffer));
277	if (5 != (rc = i2c_master_recv(c, buffer, 5)))	277	/*if (5 != (rc = i2c_master_recv(c, buffer, 5)))
278	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);	278	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/
279		279
280	rc = buffer[2] & TEA5767_STEREO_MASK;	280	rc = buffer[2] & TEA5767_STEREO_MASK;
281		281
Lines 298-305 Link Here
298	TEA5767_ST_NOISE_CTL \| TEA5767_JAPAN_BAND \| TEA5767_STDBY;	298	TEA5767_ST_NOISE_CTL \| TEA5767_JAPAN_BAND \| TEA5767_STDBY;
299	buffer[4] = 0;	299	buffer[4] = 0;
300		300
301	if (5 != (rc = i2c_master_send(c, buffer, 5)))	301	/*if (5 != (rc = i2c_master_send(c, buffer, 5)))
302	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);	302	tuner_warn("i2c i/o error: rc == %d (should be 5)\n", rc);*/
303	}	303	}
304		304
305	int tea5767_autodetection(struct i2c_client *c)	305	int tea5767_autodetection(struct i2c_client *c)