diff options
author | Andrei Warkentin <andrey.warkentin@gmail.com> | 2011-09-24 12:12:30 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-10-26 16:32:16 -0400 |
commit | 5238acbe36dd5100fb6b035a995ae5fc89dd0708 (patch) | |
tree | 066f71287fab49f24047e7a96721197a96ecdacd /drivers/mmc | |
parent | d9618e9f1a057efdfc52514d6cd7af56e9bddc17 (diff) |
mmc: core: ext_csd.raw_* used in comparison but never set
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>
Cc: <stable@kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/core/mmc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index c2334d636fe8..c632b1faf70d 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c | |||
@@ -359,6 +359,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) | |||
359 | * card has the Enhanced area enabled. If so, export enhanced | 359 | * card has the Enhanced area enabled. If so, export enhanced |
360 | * area offset and size to user by adding sysfs interface. | 360 | * area offset and size to user by adding sysfs interface. |
361 | */ | 361 | */ |
362 | card->ext_csd.raw_partition_support = ext_csd[EXT_CSD_PARTITION_SUPPORT]; | ||
362 | if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) && | 363 | if ((ext_csd[EXT_CSD_PARTITION_SUPPORT] & 0x2) && |
363 | (ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) { | 364 | (ext_csd[EXT_CSD_PARTITION_ATTRIBUTE] & 0x1)) { |
364 | u8 hc_erase_grp_sz = | 365 | u8 hc_erase_grp_sz = |
@@ -407,6 +408,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd) | |||
407 | card->ext_csd.rst_n_function = ext_csd[EXT_CSD_RST_N_FUNCTION]; | 408 | card->ext_csd.rst_n_function = ext_csd[EXT_CSD_RST_N_FUNCTION]; |
408 | } | 409 | } |
409 | 410 | ||
411 | card->ext_csd.raw_erased_mem_count = ext_csd[EXT_CSD_ERASED_MEM_CONT]; | ||
410 | if (ext_csd[EXT_CSD_ERASED_MEM_CONT]) | 412 | if (ext_csd[EXT_CSD_ERASED_MEM_CONT]) |
411 | card->erased_byte = 0xFF; | 413 | card->erased_byte = 0xFF; |
412 | else | 414 | else |