Merge tag 'iwlwifi-for-kalle-2015-01-15' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / hvc / hvsi_lib.c

diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
index 347050ea414a7f37e3962869f29437129cea1c75..a270f04588d710e7dd4f716049abcfc4a3ebaae4 100644 (file)
--- a/drivers/tty/hvc/hvsi_lib.c
+++ b/drivers/tty/hvc/hvsi_lib.c
@@ -1,5 +1,4 @@
 #include <linux/types.h>
-#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/console.h>
@@ -406,8 +405,7 @@ void hvsilib_close(struct hvsi_priv *pv, struct hvc_struct *hp)
                hvsi_send_close(pv);
        }
 
-       if (pv->tty)
-               tty_kref_put(pv->tty);
+       tty_kref_put(pv->tty);
        pv->tty = NULL;
 }