[POWERPC] Off-by-one in /arch/ppc/platforms/mpc8*

A find -iname \*.[ch] | xargs grep "> ARRAY_SIZE(" revealed several
incorrect usages of ARRAY_SIZE in the mpc drivers.  The last element in the
array is always ARRAY_SIZE()-1, this patch modifies the bounds checks
accordingly.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Cc: Vitaly Bordug <vbordug@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c
index d7b3a6afa78f..1f9ea36837b1 100644
--- a/arch/ppc/platforms/mpc8272ads_setup.c
+++ b/arch/ppc/platforms/mpc8272ads_setup.c
@@ -196,7 +196,7 @@ static void __init mpc8272ads_fixup_enet_pdata(struct platform_device *pdev,
         bd_t* bi = (void*)__res;
         int fs_no = fsid_fcc1+pdev->id-1;
 
-        if(fs_no > ARRAY_SIZE(mpc82xx_enet_pdata)) {
+        if(fs_no >= ARRAY_SIZE(mpc82xx_enet_pdata)) {
                 return;
         }
 
@@ -222,7 +222,7 @@ static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev,
         int id = fs_uart_id_scc2fsid(idx);
 
         /* no need to alter anything if console */
-        if ((id <= num) && (!pdev->dev.platform_data)) {
+        if ((id < num) && (!pdev->dev.platform_data)) {
                 pinfo = &mpc8272_uart_pdata[id];
                 pinfo->uart_clk = bd->bi_intfreq;
                 pdev->dev.platform_data = pinfo;
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c
index 5f130dca3770..e95d2c111747 100644
--- a/arch/ppc/platforms/mpc866ads_setup.c
+++ b/arch/ppc/platforms/mpc866ads_setup.c
@@ -259,7 +259,7 @@ static void mpc866ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no)
         /* Get pointer to Communication Processor */
         cp = cpmp;
 
-        if(fs_no > ARRAY_SIZE(mpc8xx_enet_pdata)) {
+        if(fs_no >= ARRAY_SIZE(mpc8xx_enet_pdata)) {
                 printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
                 return;
         }
@@ -305,7 +305,7 @@ static void __init mpc866ads_fixup_uart_pdata(struct platform_device *pdev,
         int id = fs_uart_id_smc2fsid(idx);
 
         /* no need to alter anything if console */
-        if ((id <= num) && (!pdev->dev.platform_data)) {
+        if ((id < num) && (!pdev->dev.platform_data)) {
                 pinfo = &mpc866_uart_pdata[id];
                 pinfo->uart_clk = bd->bi_intfreq;
                 pdev->dev.platform_data = pinfo;
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c
index 02293141efb5..f8161f3557f5 100644
--- a/arch/ppc/platforms/mpc885ads_setup.c
+++ b/arch/ppc/platforms/mpc885ads_setup.c
@@ -263,7 +263,7 @@ static void mpc885ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no)
         char *e;
         int i;
 
-        if(fs_no > ARRAY_SIZE(mpc8xx_enet_pdata)) {
+        if(fs_no >= ARRAY_SIZE(mpc8xx_enet_pdata)) {
                 printk(KERN_ERR"No network-suitable #%d device on bus", fs_no);
                 return;
         }
@@ -371,7 +371,7 @@ static void __init mpc885ads_fixup_uart_pdata(struct platform_device *pdev,
         int id = fs_uart_id_smc2fsid(idx);
 
         /* no need to alter anything if console */
-        if ((id <= num) && (!pdev->dev.platform_data)) {
+        if ((id < num) && (!pdev->dev.platform_data)) {
                 pinfo = &mpc885_uart_pdata[id];
                 pinfo->uart_clk = bd->bi_intfreq;
                 pdev->dev.platform_data = pinfo;