From 1c26ec89533391ef18829507becba41b7d495a3c Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@jak-linux.org>
Date: Tue, 27 Sep 2011 19:00:55 +0200
Subject: [PATCH] --- yaml --- r: 268572 b: refs/heads/master c:
 1b9bf629ea42fdacd951b9190f86b028557bbe19 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/staging/nvec/nvec.c | 11 +++++++++--
 trunk/drivers/staging/nvec/nvec.h |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e679a33993e2..56c5ca935162 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff169c1487381aa522b92b9f0c87bd92577bfc80
+refs/heads/master: 1b9bf629ea42fdacd951b9190f86b028557bbe19
diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c
index fee4ee0b4b68..dc3c0c64ed86 100644
--- a/trunk/drivers/staging/nvec/nvec.c
+++ b/trunk/drivers/staging/nvec/nvec.c
@@ -154,13 +154,16 @@ static void nvec_gpio_set_value(struct nvec_chip *nvec, int value)
 	gpio_set_value(nvec->gpio, value);
 }
 
-void nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
+int nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
 			short size)
 {
 	struct nvec_msg *msg;
 	unsigned long flags;
 
 	msg = nvec_msg_alloc(nvec);
+	if (msg == NULL)
+		return -ENOMEM;
+
 	msg->data[0] = size;
 	memcpy(msg->data + 1, data, size);
 	msg->size = size + 1;
@@ -170,6 +173,8 @@ void nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
 	spin_unlock_irqrestore(&nvec->tx_lock, flags);
 
 	queue_work(nvec->wq, &nvec->tx_work);
+
+	return 0;
 }
 EXPORT_SYMBOL(nvec_write_async);
 
@@ -181,7 +186,9 @@ struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec,
 	mutex_lock(&nvec->sync_write_mutex);
 
 	nvec->sync_write_pending = (data[1] << 8) + data[0];
-	nvec_write_async(nvec, data, size);
+
+	if (nvec_write_async(nvec, data, size) < 0)
+		return NULL;
 
 	dev_dbg(nvec->dev, "nvec_sync_write: 0x%04x\n",
 					nvec->sync_write_pending);
diff --git a/trunk/drivers/staging/nvec/nvec.h b/trunk/drivers/staging/nvec/nvec.h
index 851d7831a11d..a39cfc15b4cb 100644
--- a/trunk/drivers/staging/nvec/nvec.h
+++ b/trunk/drivers/staging/nvec/nvec.h
@@ -97,7 +97,7 @@ struct nvec_chip {
 	int state;
 };
 
-extern void nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
+extern int nvec_write_async(struct nvec_chip *nvec, const unsigned char *data,
 			     short size);
 
 extern struct nvec_msg *nvec_write_sync(struct nvec_chip *nvec,