[PATCH] kfree cleanup: misc remaining drivers

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

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

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
Acked-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Acked-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Len Brown <len.brown@intel.com>
Acked-by: "Antonino A. Daplas" <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index e375995a2e9b..5c8943509cc1 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -554,8 +554,8 @@ int fcp_initialize(fc_channel *fcchain, int count)
         l->logi = kzalloc (count * 3 * sizeof(logi), GFP_KERNEL);
         l->fcmds = kzalloc (count * sizeof(fcp_cmnd), GFP_KERNEL);
         if (!l->logi || !l->fcmds) {
-                if (l->logi) kfree (l->logi);
-                if (l->fcmds) kfree (l->fcmds);
+                kfree (l->logi);
+                kfree (l->fcmds);
                 kfree (l);
                 printk ("FC: Cannot allocate DMA memory for initialization\n");
                 return -ENOMEM;
@@ -674,7 +674,6 @@ int fcp_forceoffline(fc_channel *fcchain, int count)
         atomic_set (&l.todo, count);
         l.fcmds = kzalloc (count * sizeof(fcp_cmnd), GFP_KERNEL);
         if (!l.fcmds) {
-                kfree (l.fcmds);
                 printk ("FC: Cannot allocate memory for forcing offline\n");
                 return -ENOMEM;
         }