Merge git://git.infradead.org/mtd-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / mtd / devices / slram.c

diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 7d846e9173da4a967e169c711fc64393d7d3c933..3aa05cd18ea195878141aabe1669def78bc60dc6 100644 (file)
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -341,7 +341,7 @@ static int __init init_slram(void)
 #else
        int count;
 
-       for (count = 0; (map[count]) && (count < SLRAM_MAX_DEVICES_PARAMS);
+       for (count = 0; count < SLRAM_MAX_DEVICES_PARAMS && map[count];
                        count++) {
        }