From ceabfdb2d76408720792a9c2bfea080139904db1 Mon Sep 17 00:00:00 2001
From: Sergey Datsevich <snsedats@faui49man4.informatik.uni-erlangen.de>
Date: Wed, 7 Dec 2011 19:06:37 +0100
Subject: [PATCH] --- yaml --- r: 281311 b: refs/heads/master c:
 04e7bbad44c1a0c449719f90d507d13e015f1444 h: refs/heads/master i:   281309:
 25e1b83e12d80e6bfc54cf4bc699a21c6ed648dd   281307:
 8c284c38b0e081c0e1146ee152471f0d9771f6ad   281303:
 f09efa780dbae978fc51fbbfc412fa5967b91321   281295:
 d7b0b2c9bccb87472560074354711af61f0a2459   281279:
 ed15316e99bddfbb0f43c40355872f749c3eb36f v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/zram/zram_sysfs.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b221f4aefd25..a5b4cf3130e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e8087a4fae41ae1518babbf1ef46f105d702bfd
+refs/heads/master: 04e7bbad44c1a0c449719f90d507d13e015f1444
diff --git a/trunk/drivers/staging/zram/zram_sysfs.c b/trunk/drivers/staging/zram/zram_sysfs.c
index 0ea8ed296a9d..d521122826f6 100644
--- a/trunk/drivers/staging/zram/zram_sysfs.c
+++ b/trunk/drivers/staging/zram/zram_sysfs.c
@@ -58,7 +58,7 @@ static ssize_t disksize_store(struct device *dev,
 	u64 disksize;
 	struct zram *zram = dev_to_zram(dev);
 
-	ret = strict_strtoull(buf, 10, &disksize);
+	ret = kstrtoull(buf, 10, &disksize);
 	if (ret)
 		return ret;
 
@@ -88,7 +88,7 @@ static ssize_t reset_store(struct device *dev,
 		struct device_attribute *attr, const char *buf, size_t len)
 {
 	int ret;
-	unsigned long do_reset;
+	unsigned short do_reset;
 	struct zram *zram;
 	struct block_device *bdev;
 
@@ -99,7 +99,7 @@ static ssize_t reset_store(struct device *dev,
 	if (bdev->bd_holders)
 		return -EBUSY;
 
-	ret = strict_strtoul(buf, 10, &do_reset);
+	ret = kstrtou16(buf, 10, &do_reset);
 	if (ret)
 		return ret;