aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-07-14 18:20:29 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-17 13:21:03 +0200
commit2fe1b32156a2f28013c2807d1674dd1ced1a6fa1 (patch)
tree3d76ba0cf1eae9fdf7f2dd8d7a2deb92ce8e09e5 /target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
parent269e49577b8d8c49a2694cb8e9939822cd7c9eb3 (diff)
downloadupstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.gz
upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.tar.bz2
upstream-2fe1b32156a2f28013c2807d1674dd1ced1a6fa1.zip
kernel: bump 5.4 to 5.4.132
Manually rebased: layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
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 a9f99add60..f70887855b 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);
-@@ -2884,6 +2891,7 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2892,6 +2899,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.
-@@ -2891,7 +2899,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2899,7 +2907,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);
-@@ -2906,9 +2923,14 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2914,9 +2931,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));