Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.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 2f0463e..4a26820 100644 (file)
--- a/drivers/staging/media/lirc/lirc_sasem.c
+++ b/drivers/staging/media/lirc/lirc_sasem.c
@@ -488,7 +488,7 @@ static int ir_open(void *data)
        /* prevent races with disconnect */
        mutex_lock(&disconnect_lock);
 
-       context = (struct sasem_context *) data;
+       context = data;
 
        mutex_lock(&context->ctx_lock);
 
@@ -530,7 +530,7 @@ static void ir_close(void *data)
 {
        struct sasem_context *context;
 
-       context = (struct sasem_context *)data;
+       context = data;
        if (!context) {
                pr_err("%s: no context for device\n", __func__);
                return;