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

Commit 94dee760 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7758): ivtv: fix oops when itv->speed == 0 and VIDEO_CMD_PLAY is called 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 22f23fcc

drivers/media/video/ivtv/ivtv-ioctl.c

+21 −10
Original line number Original line Diff line number Diff line
@@ -243,20 +243,31 @@ static int ivtv_validate_speed(int cur_speed, int new_speed) 
	int fact = new_speed < 0 ? -1 : 1;

	int fact = new_speed < 0 ? -1 : 1;

	int s;

	int s;





	if (new_speed < 0) new_speed = -new_speed;

	if (cur_speed == 0)

	if (cur_speed < 0) cur_speed = -cur_speed;

		cur_speed = 1000;

	if (new_speed < 0)

		new_speed = -new_speed;

	if (cur_speed < 0)

		cur_speed = -cur_speed;





	if (cur_speed <= new_speed) {

	if (cur_speed <= new_speed) {

		if (new_speed > 1500) return fact * 2000;

		if (new_speed > 1500)

		if (new_speed > 1000) return fact * 1500;

			return fact * 2000;

		if (new_speed > 1000)

			return fact * 1500;

	}

	}

	else {

	else {

		if (new_speed >= 2000) return fact * 2000;

		if (new_speed >= 2000)

		if (new_speed >= 1500) return fact * 1500;

			return fact * 2000;

		if (new_speed >= 1000) return fact * 1000;

		if (new_speed >= 1500)

	}

			return fact * 1500;

	if (new_speed == 0) return 1000;

		if (new_speed >= 1000)

	if (new_speed == 1 || new_speed == 1000) return fact * new_speed;

			return fact * 1000;

	}

	if (new_speed == 0)

		return 1000;

	if (new_speed == 1 || new_speed == 1000)

		return fact * new_speed;





	s = new_speed;

	s = new_speed;

	new_speed = 1000 / new_speed;

	new_speed = 1000 / new_speed;