diff --git a/[refs] b/[refs]
index 8c7e41e3c936..5dd1a9a252bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4bbf2f541501dcde47ce687ffc6d238bd2f7813
+refs/heads/master: e2df64c1d767eb52a5c617668e20745d5e3015c8
diff --git a/trunk/drivers/net/wireless/ath/ath5k/sysfs.c b/trunk/drivers/net/wireless/ath/ath5k/sysfs.c
index 1090bbab9459..5406f44309c8 100644
--- a/trunk/drivers/net/wireless/ath/ath5k/sysfs.c
+++ b/trunk/drivers/net/wireless/ath/ath5k/sysfs.c
@@ -19,9 +19,11 @@ static ssize_t ath5k_attr_store_##name(struct device *dev,		\
 			const char *buf, size_t count)			\
 {									\
 	struct ath5k_softc *sc = dev_get_drvdata(dev);			\
-	int val;							\
+	int val, ret;							\
 									\
-	val = (int)simple_strtoul(buf, NULL, 10);			\
+	ret = kstrtoint(buf, 10, &val);					\
+	if (ret < 0)							\
+		return ret;						\
 	set(sc->ah, val);						\
 	return count;							\
 }									\