Merge tag 'media/v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / media / lirc / lirc_sasem.c

diff --git a/drivers/staging/media/lirc/lirc_sasem.c b/drivers/staging/media/lirc/lirc_sasem.c
index d3dedb831dee761f09c8f66c2a6317efc47a26af..f2dca69c2bc0ed3ea8704e9d9df68ba4d04fc980 100644 (file)
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -181,7 +181,7 @@ static void deregister_from_lirc(struct sasem_context *context)
        if (retval)
                dev_err(&context->dev->dev,
                        "%s: unable to deregister from lirc (%d)\n",
-                      __func__, retval);
+                       __func__, retval);
        else
                dev_info(&context->dev->dev,
                         "Deregistered Sasem driver (minor:%d)\n", minor);
@@ -244,7 +244,7 @@ exit:
  */
 static long vfd_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 {
-       struct sasem_context *context = NULL;
+       struct sasem_context *context;
 
        context = (struct sasem_context *) file->private_data;