From a46bf2a4baaaca10fdbb30fe27fb37ac5ecccd8d Mon Sep 17 00:00:00 2001
From: Aurora <davidone92@katamail.com>
Date: Thu, 29 Sep 2016 16:21:08 +0200
Subject: [PATCH] Minor stuff (2)

---
 source/fatfs/diskio.c      |  3 +--
 source/fatfs/sdmmc/sdmmc.c | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/source/fatfs/diskio.c b/source/fatfs/diskio.c
index aa67269..c9b5114 100644
--- a/source/fatfs/diskio.c
+++ b/source/fatfs/diskio.c
@@ -37,8 +37,7 @@ DSTATUS disk_initialize (
 	BYTE pdrv				/* Physical drive nmuber to identify the drive */
 )
 {
-        if(pdrv == CTRNAND)
-            ctrNandInit();
+        if(pdrv == CTRNAND) ctrNandInit();
 
 	return RES_OK;
 }
diff --git a/source/fatfs/sdmmc/sdmmc.c b/source/fatfs/sdmmc/sdmmc.c
index 3836853..22138ea 100644
--- a/source/fatfs/sdmmc/sdmmc.c
+++ b/source/fatfs/sdmmc/sdmmc.c
@@ -266,17 +266,17 @@ static u32 calcSDSize(u8 *csd, int type)
     switch(type)
     {
         case 0:
-            {
-                u32 block_len = csd[9] & 0xF;
-                block_len = 1u << block_len;
-                u32 mult = (u32)((csd[4] >> 7) | ((csd[5] & 3) << 1));
-                mult = 1u << (mult + 2);
-                result = csd[8] & 3;
-                result = (result << 8) | csd[7];
-                result = (result << 2) | (csd[6] >> 6);
-                result = (result + 1) * mult * block_len / 512;
-            }
+        {
+            u32 block_len = csd[9] & 0xF;
+            block_len = 1u << block_len;
+            u32 mult = (u32)((csd[4] >> 7) | ((csd[5] & 3) << 1));
+            mult = 1u << (mult + 2);
+            result = csd[8] & 3;
+            result = (result << 8) | csd[7];
+            result = (result << 2) | (csd[6] >> 6);
+            result = (result + 1) * mult * block_len / 512;
             break;
+        }
         case 1:
             result = csd[7] & 0x3F;
             result = (result << 8) | csd[6];
@@ -473,5 +473,5 @@ void sdmmc_get_cid(bool isNand, u32 *info)
 bool sdmmc_sdcard_init()
 {
     InitSD();
-    return Nand_Init() + SD_Init() == 0;
+    return (Nand_Init() | SD_Init()) == 0;
 }
\ No newline at end of file