From fb87306e16e7961c932c1045302fd04b150c1fb4 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 28 Jul 2011 13:59:35 -0700
Subject: [PATCH] --- yaml --- r: 262882 b: refs/heads/master c:
 09f9390d797ff34020faab866996884fd93a0081 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/speakup/devsynth.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e522254cc08a..009858cd06eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f89615528b11eabda68faaf2438d09c9565a125
+refs/heads/master: 09f9390d797ff34020faab866996884fd93a0081
diff --git a/trunk/drivers/staging/speakup/devsynth.c b/trunk/drivers/staging/speakup/devsynth.c
index 39dc586fc8bb..940769ef883f 100644
--- a/trunk/drivers/staging/speakup/devsynth.c
+++ b/trunk/drivers/staging/speakup/devsynth.c
@@ -18,13 +18,14 @@ static ssize_t speakup_file_write(struct file *fp, const char *buffer,
 {
 	size_t count = nbytes;
 	const char *ptr = buffer;
-	int bytes;
+	size_t bytes;
 	unsigned long flags;
 	u_char buf[256];
+
 	if (synth == NULL)
 		return -ENODEV;
 	while (count > 0) {
-		bytes = min_t(size_t, count, sizeof(buf));
+		bytes = min(count, sizeof(buf));
 		if (copy_from_user(buf, ptr, bytes))
 			return -EFAULT;
 		count -= bytes;