Subject: linux-next: manual merge of the mmc tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 May 2014 13:44:55 +1000

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
the  tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
remove smatch warnings") from the mmc tree.

I fixed it up (maybe - see below and in the final tree) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/mmc/host/rtsx_pci_sdmmc.c
index 0b9ded13a3ae,09340b9429ec..000000000000
--- a/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@@ -258,10 -375,11 +260,13 @@@ static void sd_send_cmd_get_rsp(struct 
  	if (cmd->opcode == SD_SWITCH_VOLTAGE) {
  		err = rtsx_pci_write_register(pcr, SD_BUS_STAT,
  				0xFF, SD_CLK_TOGGLE_EN);
- 		if (err < 0)
+ 		if (err < 0) {
+ 			rtsx_pci_write_register(pcr, SD_BUS_STAT,
+ 				SD_CLK_TOGGLE_EN | SD_CLK_FORCE_STOP, 0);
  			goto out;
+ 		}
 +
 +		clock_toggled = true;
  	}
  
  	rtsx_pci_init_cmd(pcr);