Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75727460 authored by Gary Francis's avatar Gary Francis Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13500): pvrusb2: Fix lingering 16KB FX2 Firmware issues 



These are additional fixes to enable proper pvrusb2 support of 16KB
sized FX2 firmware.

Signed-off-by: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9081d901

drivers/media/video/pvrusb2/pvrusb2-devattr.c

+1 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ static const struct pvr2_device_desc pvr2_device_73xxx = { 
		.flag_has_analogtuner = !0,

		.flag_has_composite = !0,

		.flag_has_svideo = !0,

		.flag_fx2_16kb = !0,

		.signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,

		.digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,

		.led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+2 −2
Original line number Diff line number Diff line
@@ -1522,8 +1522,8 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw) 


	trace_firmware("Upload done (%d bytes sent)",ret);



	/* We should have written 8192 bytes */

	if (ret == 8192) {

	/* We should have written fwsize bytes */

	if (ret == fwsize) {

		hdw->fw1_state = FW1_STATE_RELOAD;

		return 0;

	}