From: Tom Rini <trini@konsulko.com>
Date: Fri, 11 Jan 2019 14:54:44 +0000 (-0500)
Subject: Revert "fs: fat: assign rootdir sector when accessing root directory"
X-Git-Tag: v2025.01-rc5-pxa1908~3184
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-logo.png?a=commitdiff_plain;h=d3035b856027cb9621a252aafc6316b3724d6294;p=u-boot.git

Revert "fs: fat: assign rootdir sector when accessing root directory"

This particular commit is causing a regression on stih410-b2260 and
other platforms when reading from FAT16.  Noting that I had rebased the
original fix from Thomas onto then-current master, there is also
question from Akashi-san if the change is still needed after other FAT
fixes that have gone in.

This reverts commit a68b0e11ea774492713a65d9fd5bb525fcaefff3.

Reported-by: Patrice Chotard <patrice.chotard@st.com>
Cc: AKASHI Takahiro <takahiro.akashi@linaro.org>
Cc: Thomas RIENOESSL <thomas.rienoessl@bachmann.info>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index ac8913e719..179bf4f3d8 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -736,10 +736,7 @@ static void *next_cluster(fat_itr *itr)
 	if (itr->last_cluster)
 		return NULL;
 
-	if (itr->fsdata->fatsize != 32 && itr->is_root)
-		sect = mydata->rootdir_sect;
-	else
-		sect = clust_to_sect(itr->fsdata, itr->next_clust);
+	sect = clust_to_sect(itr->fsdata, itr->next_clust);
 
 	debug("FAT read(sect=%d), clust_size=%d, DIRENTSPERBLOCK=%zd\n",
 	      sect, itr->fsdata->clust_size, DIRENTSPERBLOCK);