From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Jul 2014 21:00:00 +0000 (-0700)
Subject: 3.15-stable patches
X-Git-Tag: v3.4.98~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e3e88553a7d1f80c3d179e9de41ce8fd83f59c1;p=thirdparty%2Fkernel%2Fstable-queue.git

3.15-stable patches

added patches:
	mmc-rtsx-add-r1-no-crc-mmc-command-type-handle.patch
---

diff --git a/queue-3.15/mmc-rtsx-add-r1-no-crc-mmc-command-type-handle.patch b/queue-3.15/mmc-rtsx-add-r1-no-crc-mmc-command-type-handle.patch
new file mode 100644
index 00000000000..e2df5301e68
--- /dev/null
+++ b/queue-3.15/mmc-rtsx-add-r1-no-crc-mmc-command-type-handle.patch
@@ -0,0 +1,35 @@
+From 5027251eced6e34315a52bd841279df957f627bb Mon Sep 17 00:00:00 2001
+From: Micky Ching <micky_ching@realsil.com.cn>
+Date: Thu, 27 Mar 2014 13:35:04 +0800
+Subject: mmc: rtsx: add R1-no-CRC mmc command type handle
+
+From: Micky Ching <micky_ching@realsil.com.cn>
+
+commit 5027251eced6e34315a52bd841279df957f627bb upstream.
+
+a27fbf2f067b0cd ("mmc: add ignorance case for CMD13 CRC error") produced
+a cmd.flags unhandled in realtek pci host driver.  This will make MMC
+card fail to initialize, this patch is used to handle the new cmd.flags
+condition and MMC card can be used.
+
+Signed-off-by: Micky Ching <micky_ching@realsil.com.cn>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Chris Ball <chris@printf.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/mmc/host/rtsx_pci_sdmmc.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
++++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
+@@ -236,6 +236,9 @@ static void sd_send_cmd_get_rsp(struct r
+ 	case MMC_RSP_R1:
+ 		rsp_type = SD_RSP_TYPE_R1;
+ 		break;
++	case MMC_RSP_R1 & ~MMC_RSP_CRC:
++		rsp_type = SD_RSP_TYPE_R1 | SD_NO_CHECK_CRC7;
++		break;
+ 	case MMC_RSP_R1B:
+ 		rsp_type = SD_RSP_TYPE_R1b;
+ 		break;
diff --git a/queue-3.15/series b/queue-3.15/series
index b154ac9ad1b..27d01f836c8 100644
--- a/queue-3.15/series
+++ b/queue-3.15/series
@@ -118,3 +118,4 @@ tty-correct-inpck-handling.patch
 netfilter-ctnetlink-fix-dumping-of-dying-unconfirmed-conntracks.patch
 netfilter-nf_nat-fix-oops-on-netns-removal.patch
 netfilter-ctnetlink-fix-refcnt-leak-in-dying-unconfirmed-list-dumper.patch
+mmc-rtsx-add-r1-no-crc-mmc-command-type-handle.patch