| From 5238acbe36dd5100fb6b035a995ae5fc89dd0708 Mon Sep 17 00:00:00 2001 |
| From: Andrei Warkentin <andrey.warkentin@gmail.com> |
| Date: Sat, 24 Sep 2011 12:12:30 -0400 |
| Subject: mmc: core: ext_csd.raw_* used in comparison but never set |
| |
| From: Andrei Warkentin <andrey.warkentin@gmail.com> |
| |
| commit 5238acbe36dd5100fb6b035a995ae5fc89dd0708 upstream. |
| |
| f39b2dd9d ("mmc: core: Bus width testing needs to handle suspend/resume") |
| added code to only compare read-only ext_csd fields in bus width testing |
| code, yet it's comparing some fields that are never set. |
| |
| The affected fields are ext_csd.raw_erased_mem_count and |
| ext_csd.raw_partition_support. |
| |
| Signed-off-by: Andrei Warkentin <andrey.warkentin@gmail.com> |
| Acked-by: Philip Rakity <prakity@marvell.com> |
| Signed-off-by: Chris Ball <cjb@laptop.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/mmc/core/mmc.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/mmc/core/mmc.c |
| +++ b/drivers/mmc/core/mmc.c |
| @@ -359,6 +359,7 @@ static int mmc_read_ext_csd(struct mmc_c |
| * card has the Enhanced area enabled. If so, export enhanced |
| * area offset and size to user by adding sysfs interface. |
| */ |
| + card->ext_csd.raw_partition_support = ext_csd[EXT_CSD_PARTITION_SUPPORT]; |
| if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) && |
| (ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) { |
| u8 hc_erase_grp_sz = |
| @@ -405,6 +406,7 @@ static int mmc_read_ext_csd(struct mmc_c |
| if (card->ext_csd.rev >= 5) |
| card->ext_csd.rel_param = ext_csd[EXT_CSD_WR_REL_PARAM]; |
| |
| + card->ext_csd.raw_erased_mem_count = ext_csd[EXT_CSD_ERASED_MEM_CONT]; |
| if (ext_csd[EXT_CSD_ERASED_MEM_CONT]) |
| card->erased_byte = 0xFF; |
| else |
