diff --git a/[refs] b/[refs]
index be994a12d73e..83a59120f265 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcbf77bf872c28ac3f18261a44af91383f0a2f3d
+refs/heads/master: 79e7c561aeea958479194e24d711e94615ea2823
diff --git a/trunk/drivers/staging/lirc/lirc_sasem.c b/trunk/drivers/staging/lirc/lirc_sasem.c
index d1ac0997f51b..2e681cf3e85d 100644
--- a/trunk/drivers/staging/lirc/lirc_sasem.c
+++ b/trunk/drivers/staging/lirc/lirc_sasem.c
@@ -386,7 +386,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
 	}
 
 	data_buf = memdup_user(buf, n_bytes);
-	if (PTR_ERR(data_buf)) {
+	if (IS_ERR(data_buf)) {
 		retval = PTR_ERR(data_buf);
 		goto exit;
 	}