[PATCH 04/10] fsi: Fix one and two byte bus reads/writes

[Joel Stanley]

From: Eddie James <eaja...@us.ibm.com>

Address checker fixed to allow one and two byte reads/writes.
Address alignments for each size verified.

Signed-off-by: Edward James <eaja...@us.ibm.com>
Signed-off-by: Christopher Bostic <cbos...@linux.vnet.ibm.com>
Acked-by: Jeremy Kerr <j...@ozlabs.org>
Signed-off-by: Joel Stanley <j...@jms.id.au>
---
 drivers/fsi/fsi-core.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 6e5aa9b26665..e5dfece248a5 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -656,10 +656,13 @@ static int fsi_slave_init(struct fsi_master *master, int 
link, uint8_t id)
 /* FSI master support */
 static int fsi_check_access(uint32_t addr, size_t size)
 {
-       if (size != 1 && size != 2 && size != 4)
-               return -EINVAL;
-
-       if ((addr & 0x3) != (size & 0x3))
+       if (size == 4) {
+               if (addr & 0x3)
+                       return -EINVAL;
+       } else if (size == 2) {
+               if (addr & 0x1)
+                       return -EINVAL;
+       } else if (size != 1)
                return -EINVAL;
 
        return 0;
-- 
2.15.1