1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 616d90bcb3a4..9037ffa100d5 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -419,14 +419,16 @@ error:
                 kfree(mci->dimms);
         }
         if (mci->csrows) {
-                for (chn = 0; chn < tot_channels; chn++) {
-                        csr = mci->csrows[chn];
+                for (row = 0; row < tot_csrows; row++) {
+                        csr = mci->csrows[row];
                         if (csr) {
-                                for (chn = 0; chn < tot_channels; chn++)
-                                        kfree(csr->channels[chn]);
+                                if (csr->channels) {
+                                        for (chn = 0; chn < tot_channels; chn++)
+                                                kfree(csr->channels[chn]);
+                                        kfree(csr->channels);
+                                }
                                 kfree(csr);
                         }
-                        kfree(mci->csrows[i]);
                 }
                 kfree(mci->csrows);
         }