From: Ming Lei <ming.lei@canonical.com>
Date: Mon, 12 Jan 2015 16:01:35 +0000 (+0800)
Subject: firmware_loader: abort request if wait_for_completion is interrupted
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0cb64249ca500;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

firmware_loader: abort request if wait_for_completion is interrupted

If current request is interrupted by signal, such as 'ctrl + c',
this request has to be aborted for the following reasons:

	- the buf need to be removed from pending list
	- same requests from other contexts need to be completed

Reported-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 96d994a35372..5870ec35efe6 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -927,6 +927,13 @@ static int _request_firmware_load(struct firmware_priv *fw_priv,
 	retval = wait_for_completion_interruptible(&buf->completion);
 
 	cancel_delayed_work_sync(&fw_priv->timeout_work);
+
+	if (retval == -ERESTARTSYS) {
+		mutex_lock(&fw_lock);
+		fw_load_abort(fw_priv);
+		mutex_unlock(&fw_lock);
+	}
+
 	if (is_fw_load_aborted(buf))
 		retval = -EAGAIN;
 	else if (!buf->data)