6 files changed, 20 insertions, 6 deletions

diff --git a/drivers/staging/lirc/lirc_imon.c b/drivers/staging/lirc/lirc_imon.c
index 0da6b9518af..235cab0eb08 100644
--- a/drivers/staging/lirc/lirc_imon.c
+++ b/drivers/staging/lirc/lirc_imon.c
@@ -447,6 +447,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
 
 exit:
         mutex_unlock(&context->ctx_lock);
+        kfree(data_buf);
 
         return (!retval) ? n_bytes : retval;
 }
diff --git a/drivers/staging/lirc/lirc_it87.c b/drivers/staging/lirc/lirc_it87.c
index 929ae579546..5938616f3e8 100644
--- a/drivers/staging/lirc/lirc_it87.c
+++ b/drivers/staging/lirc/lirc_it87.c
@@ -232,6 +232,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
                 i++;
         }
         terminate_send(tx_buf[i - 1]);
+        kfree(tx_buf);
         return n;
 }
 
diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c
index dfd2c447e67..3a9c09881b2 100644
--- a/drivers/staging/lirc/lirc_parallel.c
+++ b/drivers/staging/lirc/lirc_parallel.c
@@ -376,6 +376,7 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
         unsigned long flags;
         int counttimer;
         int *wbuf;
+        ssize_t ret;
 
         if (!is_claimed)
                 return -EBUSY;
@@ -393,8 +394,10 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
         if (timer == 0) {
                 /* try again if device is ready */
                 timer = init_lirc_timer();
-                if (timer == 0)
-                        return -EIO;
+                if (timer == 0) {
+                        ret = -EIO;
+                        goto out;
+                }
         }
 
         /* adjust values from usecs */
@@ -420,7 +423,8 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
                         if (check_pselecd && (in(1) & LP_PSELECD)) {
                                 lirc_off();
                                 local_irq_restore(flags);
-                                return -EIO;
+                                ret = -EIO;
+                                goto out;
                         }
                 } while (counttimer < wbuf[i]);
                 i++;
@@ -436,7 +440,8 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
                         level = newlevel;
                         if (check_pselecd && (in(1) & LP_PSELECD)) {
                                 local_irq_restore(flags);
-                                return -EIO;
+                                ret = -EIO;
+                                goto out;
                         }
                 } while (counttimer < wbuf[i]);
                 i++;
@@ -445,7 +450,11 @@ static ssize_t lirc_write(struct file *filep, const char *buf, size_t n,
 #else
         /* place code that handles write without external timer here */
 #endif
-        return n;
+        ret = n;
+out:
+        kfree(wbuf);
+
+        return ret;
 }
 
 static unsigned int lirc_poll(struct file *file, poll_table *wait)
diff --git a/drivers/staging/lirc/lirc_sasem.c b/drivers/staging/lirc/lirc_sasem.c
index 998485ebdbc..925eabe1485 100644
--- a/drivers/staging/lirc/lirc_sasem.c
+++ b/drivers/staging/lirc/lirc_sasem.c
@@ -448,6 +448,7 @@ static ssize_t vfd_write(struct file *file, const char *buf,
 exit:
 
         mutex_unlock(&context->ctx_lock);
+        kfree(data_buf);
 
         return (!retval) ? n_bytes : retval;
 }
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
index 9bcf149c426..1c3099b388e 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/lirc/lirc_serial.c
@@ -966,7 +966,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
         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) {
@@ -981,6 +981,7 @@ static ssize_t lirc_write(struct file *file, const char *buf,
         }
         off();
         spin_unlock_irqrestore(&hardware[type].lock, flags);
+        kfree(wbuf);
         return n;
 }
 
diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/lirc/lirc_sir.c
index c553ab62623..76be7b8c620 100644
--- a/drivers/staging/lirc/lirc_sir.c
+++ b/drivers/staging/lirc/lirc_sir.c
@@ -330,6 +330,7 @@ static ssize_t lirc_write(struct file *file, const char *buf, size_t n,
         /* enable receiver */
         Ser2UTCR3 = UTCR3_RXE|UTCR3_RIE;
 #endif
+        kfree(tx_buf);
         return count;
 }