X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fbase%2Ffirmware_class.c;h=5870ec35efe6d9df196606771d24c5a224cbe9d9;hb=0cb64249ca50033ec22e63582837f94202c63d9f;hp=58470c3953015b7180de159082b154e5eef70256;hpb=b73f0c8f4ba810cd753031d18f4fab83bd9ac58f;p=deliverable%2Flinux.git

diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 58470c395301..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)
@@ -1194,7 +1201,7 @@ request_firmware(const struct firmware **firmware_p, const char *name,
 EXPORT_SYMBOL(request_firmware);
 
 /**
- * request_firmware: - load firmware directly without usermode helper
+ * request_firmware_direct: - load firmware directly without usermode helper
  * @firmware_p: pointer to firmware image
  * @name: name of firmware file
  * @device: device for which firmware is being loaded