commit a16881dff71510184aea4ababe1808f63f36431e
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 17 14:46:55 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 17 14:46:54 2013 -0700
tree b9bc44435e4a035132b396d16b1dcfab299dff89
parent 0e323c061c9f7cb118849c5b9f08952e683aeac5
parent eaa69b7a5a628c533f6fa17c29af041cef49601b

Merge "qseecom: Propagate error to process incomplete cmd."

drivers/misc/qseecom.c

diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
index 05a15b1..61adfec 100644
--- a/drivers/misc/qseecom.c
+++ b/drivers/misc/qseecom.c
@@ -565,13 +565,14 @@
 		if (wait_event_freezable(qseecom.send_resp_wq,
 				__qseecom_listener_has_sent_rsp(data))) {
 			pr_warning("Interrupted: exiting send_cmd loop\n");
-			return -ERESTARTSYS;
+			ret = -ERESTARTSYS;
 		}
 
-		if (data->abort) {
-			pr_err("Aborting listener service %d\n",
-				data->listener.id);
-			rc = -ENODEV;
+		if ((data->abort) || (ret == -ERESTARTSYS)) {
+			pr_err("Abort clnt %d waiting on lstnr svc %d, ret %d",
+				data->client.app_id, lstnr, ret);
+			if (data->abort)
+				rc = -ENODEV;
 			send_data_rsp.status  = QSEOS_RESULT_FAILURE;
 		} else {
 			send_data_rsp.status  = QSEOS_RESULT_SUCCESS;