V4L/DVB (11668): ivtv: fix compiler warning. (34a7864d) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -305,14 +305,17 @@ int ivtv_waitq(wait_queue_head_t *waitq)
	/* Generic utility functions */		/* Generic utility functions */
	int ivtv_msleep_timeout(unsigned int msecs, int intr)		int ivtv_msleep_timeout(unsigned int msecs, int intr)
	{		{
	int ret;
	int timeout = msecs_to_jiffies(msecs);		int timeout = msecs_to_jiffies(msecs);

	do {		do {
	set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);		set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
	timeout = schedule_timeout(timeout);		timeout = schedule_timeout(timeout);
	if (intr && (ret = signal_pending(current)))		if (intr) {
			int ret = signal_pending(current);

			if (ret)
	return ret;		return ret;
			}
	} while (timeout);		} while (timeout);
	return 0;		return 0;
	}		}