aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-05-20 12:15:27 +0200
committerPetr Štetiar <ynezz@true.cz>2020-05-20 15:26:22 +0200
commit1b2fefb244d7d2fd949104e743ff15d01bbe5bb0 (patch)
treef0e969c3acedfab614bfd015f7553a870866bffb /target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
parent982d78777396731bf1abc5447100aafb09bba684 (diff)
downloadupstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.tar.gz
upstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.tar.bz2
upstream-1b2fefb244d7d2fd949104e743ff15d01bbe5bb0.zip
kernel: bump 5.4 to 5.4.42
Refreshed patches, removed upstreamed patch: generic/pending: 001-v5.4-pinctrl-qcom-fix-wrong-write-in-update_dual_edge.patch.patch Run tested: qemu-x86-64 Build tested: x86/64, ath79/nand, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
index 362b5c9ada..4f5e392d78 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
@@ -222,7 +222,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
static inline int mmc_blk_part_switch(struct mmc_card *card,
unsigned int part_type);
-@@ -2867,6 +2874,7 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2868,6 +2875,7 @@ static int mmc_blk_probe(struct mmc_card
{
struct mmc_blk_data *md, *part_md;
char cap_str[10];
@@ -230,7 +230,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
/*
* Check that the card supports the command class(es) we need.
-@@ -2874,7 +2882,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2875,7 +2883,16 @@ static int mmc_blk_probe(struct mmc_card
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
return -ENODEV;
@@ -248,7 +248,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
card->complete_wq = alloc_workqueue("mmc_complete",
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2889,9 +2906,14 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2890,9 +2907,14 @@ static int mmc_blk_probe(struct mmc_card
string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2,
cap_str, sizeof(cap_str));