--- drivers/staging/lirc/lirc_serial.c	2011-05-07 15:09:56.000000000 -0700
+++ drivers/staging/lirc/lirc_serial.c	2011-05-07 15:14:27.000000000 -0700
@@ -966,7 +966,7 @@
 	if (n % sizeof(int) || count % 2 == 0)
 		return -EINVAL;
 	wbuf = memdup_user(buf, n);
-	if (PTR_ERR(wbuf))
+	if (IS_ERR(wbuf))
 		return PTR_ERR(wbuf);
 	spin_lock_irqsave(&hardware[type].lock, flags);
 	if (type == LIRC_IRDEO) {