[PATCH] kfree cleanup: drivers/isdn

This is the drivers/isdn/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in drivers/isdn/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 16 deletions

diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 356ee485be4b..8c404b4e2482 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -712,22 +712,14 @@ isdn_tty_modem_hup(modem_info * info, int local)
 #endif
         info->emu.vpar[4] = 0;
         info->emu.vpar[5] = 8;
-        if (info->dtmf_state) {
-                kfree(info->dtmf_state);
-                info->dtmf_state = NULL;
-        }
-        if (info->silence_state) {
-                kfree(info->silence_state);
-                info->silence_state = NULL;
-        }
-        if (info->adpcms) {
-                kfree(info->adpcms);
-                info->adpcms = NULL;
-        }
-        if (info->adpcmr) {
-                kfree(info->adpcmr);
-                info->adpcmr = NULL;
-        }
+        kfree(info->dtmf_state);
+        info->dtmf_state = NULL;
+        kfree(info->silence_state);
+        info->silence_state = NULL;
+        kfree(info->adpcms);
+        info->adpcms = NULL;
+        kfree(info->adpcmr);
+        info->adpcmr = NULL;
 #endif
         if ((info->msr & UART_MSR_RI) &&
                 (info->emu.mdmreg[REG_RUNG] & BIT_RUNG))