diff for duplicates of <20120620065809.GL20030@verge.net.au> diff --git a/a/1.txt b/N1/1.txt index 2f73c95..dede0a5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -48,16 +48,16 @@ On Wed, Jun 20, 2012 at 08:38:27AM +0200, Guennadi Liakhovetski wrote: > > > host->card_present = true; > > > } > > > + sh_mmcif_set_power(host, ios); -> > > } else if (ios->power_mode == MMC_POWER_OFF || !ios->clock) { +> > > } else if (ios->power_mode = MMC_POWER_OFF || !ios->clock) { > > > /* clock stop */ > > > sh_mmcif_clock_control(host, 0); > > > @@ -957,8 +970,8 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > > > pm_runtime_put(&host->pd->dev); > > > clk_disable(host->hclk); > > > host->power = false; -> > > - if (p->set_pwr && ios->power_mode == MMC_POWER_OFF) +> > > - if (p->set_pwr && ios->power_mode = MMC_POWER_OFF) > > > - p->set_pwr(host->pd, 0); -> > > + if (ios->power_mode == MMC_POWER_OFF) +> > > + if (ios->power_mode = MMC_POWER_OFF) > > > + sh_mmcif_set_power(host, ios); > > > } > > > host->state = STATE_IDLE; diff --git a/a/content_digest b/N1/content_digest index 80379de..d2bd765 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\0Pine.LNX.4.64.1206200820510.20254@axis700.grange\0" "From\0Simon Horman <horms@verge.net.au>\0" "Subject\0Re: [PATCH 5/5 v4] mmc: sh_mmcif: add regulator support\0" - "Date\0Wed, 20 Jun 2012 15:58:10 +0900\0" + "Date\0Wed, 20 Jun 2012 06:58:10 +0000\0" "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "Cc\0linux-mmc@vger.kernel.org" linux-sh@vger.kernel.org @@ -63,16 +63,16 @@ "> > > \t\t\thost->card_present = true;\n" "> > > \t\t}\n" "> > > +\t\tsh_mmcif_set_power(host, ios);\n" - "> > > \t} else if (ios->power_mode == MMC_POWER_OFF || !ios->clock) {\n" + "> > > \t} else if (ios->power_mode = MMC_POWER_OFF || !ios->clock) {\n" "> > > \t\t/* clock stop */\n" "> > > \t\tsh_mmcif_clock_control(host, 0);\n" "> > > @@ -957,8 +970,8 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)\n" "> > > \t\t\tpm_runtime_put(&host->pd->dev);\n" "> > > \t\t\tclk_disable(host->hclk);\n" "> > > \t\t\thost->power = false;\n" - "> > > -\t\t\tif (p->set_pwr && ios->power_mode == MMC_POWER_OFF)\n" + "> > > -\t\t\tif (p->set_pwr && ios->power_mode = MMC_POWER_OFF)\n" "> > > -\t\t\t\tp->set_pwr(host->pd, 0);\n" - "> > > +\t\t\tif (ios->power_mode == MMC_POWER_OFF)\n" + "> > > +\t\t\tif (ios->power_mode = MMC_POWER_OFF)\n" "> > > +\t\t\t\tsh_mmcif_set_power(host, ios);\n" "> > > \t\t}\n" "> > > \t\thost->state = STATE_IDLE;\n" @@ -101,4 +101,4 @@ "\n" Reviewed-by: Simon Horman <horms@verge.net.au> -186b594a93b0e45e4c8124d65a4781c69188dec4acd84a973fd7576963f80a64 +c6aa6ced8cbf5c95a531828787b570aa41aeec755b745d529d68c574930b2a1d
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.