Merge ../linux-2.6/

[sfrench/cifs-2.6.git] / drivers / message / fusion / mptfc.c

diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index d0141ccbb7afd0b0e3064c15aca086c14501df11..a8f2fa985455b6bdf88af739f6d38efdee72299b 100644 (file)
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -305,10 +305,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, int ioc_port,
        }
 
  out:
-       if (pp0_array)
-               kfree(pp0_array);
-       if (p0_array)
-               kfree(p0_array);
+       kfree(pp0_array);
+       kfree(p0_array);
        return rc;
 }