Commit d577ee00 authored by Aapo Tahkola's avatar Aapo Tahkola Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5696): M920x: add missing error handling to prevent syslog spamming 



Signed-off-by: default avatarAapo Tahkola <aet@rasterburn.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 3ab3b69d

drivers/media/dvb/dvb-usb/m920x.c

+18 −9
Original line number Original line Diff line number Diff line
@@ -407,6 +407,7 @@ static int m920x_identify_state(struct usb_device *udev, 
/* demod configurations */

/* demod configurations */

static int m920x_mt352_demod_init(struct dvb_frontend *fe)

static int m920x_mt352_demod_init(struct dvb_frontend *fe)

{

{

	int ret;

	u8 config[] = { CONFIG, 0x3d };

	u8 config[] = { CONFIG, 0x3d };

	u8 clock[] = { CLOCK_CTL, 0x30 };

	u8 clock[] = { CLOCK_CTL, 0x30 };

	u8 reset[] = { RESET, 0x80 };

	u8 reset[] = { RESET, 0x80 };
@@ -416,17 +417,25 @@ static int m920x_mt352_demod_init(struct dvb_frontend *fe) 
	u8 unk1[] = { 0x93, 0x1a };

	u8 unk1[] = { 0x93, 0x1a };

	u8 unk2[] = { 0xb5, 0x7a };

	u8 unk2[] = { 0xb5, 0x7a };





	mt352_write(fe, config, ARRAY_SIZE(config));

	mt352_write(fe, clock, ARRAY_SIZE(clock));

	mt352_write(fe, reset, ARRAY_SIZE(reset));

	mt352_write(fe, adc_ctl, ARRAY_SIZE(adc_ctl));

	mt352_write(fe, agc, ARRAY_SIZE(agc));

	mt352_write(fe, sec_agc, ARRAY_SIZE(sec_agc));

	mt352_write(fe, unk1, ARRAY_SIZE(unk1));

	mt352_write(fe, unk2, ARRAY_SIZE(unk2));



	deb("Demod init!\n");

	deb("Demod init!\n");





	if ((ret = mt352_write(fe, config, ARRAY_SIZE(config))) != 0)

		return ret;

	if ((ret = mt352_write(fe, clock, ARRAY_SIZE(clock))) != 0)

		return ret;

	if ((ret = mt352_write(fe, reset, ARRAY_SIZE(reset))) != 0)

		return ret;

	if ((ret = mt352_write(fe, adc_ctl, ARRAY_SIZE(adc_ctl))) != 0)

		return ret;

	if ((ret = mt352_write(fe, agc, ARRAY_SIZE(agc))) != 0)

		return ret;

	if ((ret = mt352_write(fe, sec_agc, ARRAY_SIZE(sec_agc))) != 0)

		return ret;

	if ((ret = mt352_write(fe, unk1, ARRAY_SIZE(unk1))) != 0)

		return ret;

	if ((ret = mt352_write(fe, unk2, ARRAY_SIZE(unk2))) != 0)

		return ret;



	return 0;

	return 0;

}

}