Merge pull request #480 from MilhouseVH/rbp_update

RBP: Additional kernel patch
This commit is contained in:
Christian Hewitt 2016-06-23 20:47:09 +04:00 committed by GitHub
commit 47887b1036
2 changed files with 60 additions and 0 deletions

View File

@ -0,0 +1,30 @@
From 04ddf9031a62eaf7048e5920d1e3a621aa7fcade Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 23 Jun 2016 16:37:46 +0100
Subject: [PATCH] mmc: Apply ERASE_BROKEN quirks correctly
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
drivers/mmc/card/block.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 74f5314..a29bf78 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2563,12 +2563,9 @@ static const struct mmc_fixup blk_fixups[] =
* On some Kingston SD cards, multiple erases of less than 64
* sectors can cause corruption.
*/
- MMC_FIXUP("SD16G", 0x41, 0x3432, add_quirk_mmc,
- MMC_QUIRK_ERASE_BROKEN),
- MMC_FIXUP("SD32G", 0x41, 0x3432, add_quirk_mmc,
- MMC_QUIRK_ERASE_BROKEN),
- MMC_FIXUP("SD64G", 0x41, 0x3432, add_quirk_mmc,
- MMC_QUIRK_ERASE_BROKEN),
+ MMC_FIXUP("SD16G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
+ MMC_FIXUP("SD32G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
+ MMC_FIXUP("SD64G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
END_FIXUP
};

View File

@ -0,0 +1,30 @@
From 04ddf9031a62eaf7048e5920d1e3a621aa7fcade Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Thu, 23 Jun 2016 16:37:46 +0100
Subject: [PATCH] mmc: Apply ERASE_BROKEN quirks correctly
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
---
drivers/mmc/card/block.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 74f5314..a29bf78 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2563,12 +2563,9 @@ static const struct mmc_fixup blk_fixups[] =
* On some Kingston SD cards, multiple erases of less than 64
* sectors can cause corruption.
*/
- MMC_FIXUP("SD16G", 0x41, 0x3432, add_quirk_mmc,
- MMC_QUIRK_ERASE_BROKEN),
- MMC_FIXUP("SD32G", 0x41, 0x3432, add_quirk_mmc,
- MMC_QUIRK_ERASE_BROKEN),
- MMC_FIXUP("SD64G", 0x41, 0x3432, add_quirk_mmc,
- MMC_QUIRK_ERASE_BROKEN),
+ MMC_FIXUP("SD16G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
+ MMC_FIXUP("SD32G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
+ MMC_FIXUP("SD64G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
END_FIXUP
};