Hi, On Mon, Jan 09 2012, Adrian Hunter wrote: > On 04/01/12 04:07, Aaron Lu wrote: >> V3: Rework on top of Adrian's vmmc patch >> >> V2: Error processing code in sdhci_pci_suspend should not be deleted, >> it is used to resume hosts which are already successfully suspended for >> a multi slot pci device as suggested by Adrian. >> >> If there are errors happened in sdhci_suspend_host, handle it so that >> when the function returns with an error, the host's behaviour is the >> same before this function call, e.g. card detection is enabled and >> tuning timer is active, etc. >> >> Signed-off-by: Philip Rakity <prakity@xxxxxxxxxxx> >> Signed-off-by: Aaron Lu <aaron.lu@xxxxxxx> >> Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx> > > Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx> Thanks, I'll push for 3.3 with Adrian's ACK and: diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a8f1f7e..0636e9a 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2348,7 +2348,8 @@ out: int sdhci_suspend_host(struct sdhci_host *host) { - int ret, has_tuning_timer; + int ret; + bool has_tuning_timer; sdhci_disable_card_detection(host); - Chris. -- Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/> One Laptop Per Child -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html