From 9f65d880adc9676842a2aaaa3fc0371e8f87f6da Mon Sep 17 00:00:00 2001
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Sat, 25 Dec 2010 15:03:58 +0900
Subject: [PATCH] --- yaml --- r: 225527 b: refs/heads/master c:
 ad9082adfc0a6bdcef1bad2f22485575479d7a9d h: refs/heads/master i:   225525:
 35a14464c1e3a77c0ac3c035bbb3222724273fd9   225523:
 e1dc471b4f53999e7f2562c644fc4b793531e24b   225519:
 e92c907bdb42b416a71027527613f2cd3e4fbb17 v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/net/wireless/airo.c | 20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2f7e1a03a3e8..bbc082dc8392 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52671e43dbfb0e0dfa5fab604cb3984bd1d777a6
+refs/heads/master: ad9082adfc0a6bdcef1bad2f22485575479d7a9d
diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c
index a36e7870b03e..57a79b0475f6 100644
--- a/trunk/drivers/net/wireless/airo.c
+++ b/trunk/drivers/net/wireless/airo.c
@@ -4652,24 +4652,18 @@ static ssize_t proc_write( struct file *file,
 			   size_t len,
 			   loff_t *offset )
 {
-	loff_t pos = *offset;
+	ssize_t ret;
 	struct proc_data *priv = file->private_data;
 
 	if (!priv->wbuffer)
 		return -EINVAL;
 
-	if (pos < 0)
-		return -EINVAL;
-	if (pos >= priv->maxwritelen)
-		return 0;
-	if (len > priv->maxwritelen - pos)
-		len = priv->maxwritelen - pos;
-	if (copy_from_user(priv->wbuffer + pos, buffer, len))
-		return -EFAULT;
-	if ( pos + len > priv->writelen )
-		priv->writelen = len + file->f_pos;
-	*offset = pos + len;
-	return len;
+	ret = simple_write_to_buffer(priv->wbuffer, priv->maxwritelen, offset,
+					buffer, len);
+	if (ret > 0)
+		priv->writelen = max_t(int, priv->writelen, *offset);
+
+	return ret;
 }
 
 static int proc_status_open(struct inode *inode, struct file *file)