From: David Kershner <david.kershner@unisys.com>
Date: Tue, 18 Apr 2017 20:55:06 +0000 (-0400)
Subject: staging: unisys: visorbus: add timeout to controlvm_periodic_work
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=04dbc09b255ec0be67e6b0f7bf114675ac143cd9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

staging: unisys: visorbus: add timeout to controlvm_periodic_work

Limit the amount that gets pulled from the queue on each try so we don't
get stuck in an infinite loop if something has gone wrong with the s-Par
firmware.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c
index 5cbc69ff3381..67583692d958 100644
--- a/drivers/staging/unisys/visorbus/visorchipset.c
+++ b/drivers/staging/unisys/visorbus/visorchipset.c
@@ -1785,6 +1785,7 @@ static void
 controlvm_periodic_work(struct work_struct *work)
 {
 	struct controlvm_message inmsg;
+	int count = 0;
 	int err;
 
 	/* Drain the RESPONSE queue make it empty */
@@ -1792,7 +1793,7 @@ controlvm_periodic_work(struct work_struct *work)
 		err = visorchannel_signalremove(chipset_dev->controlvm_channel,
 						CONTROLVM_QUEUE_RESPONSE,
 						&inmsg);
-	} while (!err);
+	} while ((!err) && (++count < CONTROLVM_MESSAGE_MAX));
 
 	if (err != -EAGAIN)
 		goto schedule_out;