diff --git a/[refs] b/[refs]
index 57c70d40d49f..8dda5275037c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b320f80a6a02bbf31f7ed6ab3332f7c4ebaaac2c
+refs/heads/master: d22e546ea18ee66c255af906f2714d3ee82d4b42
diff --git a/trunk/drivers/media/IR/ir-sysfs.c b/trunk/drivers/media/IR/ir-sysfs.c
index e47a4f102637..af1edd073b16 100644
--- a/trunk/drivers/media/IR/ir-sysfs.c
+++ b/trunk/drivers/media/IR/ir-sysfs.c
@@ -91,7 +91,7 @@ static ssize_t store_protocol(struct device *d,
 	unsigned long flags;
 	char *buf;
 
-	while (buf = strsep((char **) &data, " \n")) {
+	while ((buf = strsep((char **) &data, " \n")) != NULL) {
 		if (!strcasecmp(buf, "rc-5") || !strcasecmp(buf, "rc5"))
 			ir_type |= IR_TYPE_RC5;
 		if (!strcasecmp(buf, "pd") || !strcasecmp(buf, "pulse-distance"))