Merge pull request #219 from technion/rpi-3.6.y

popcornmix · popcornmix · commit d3fb4f8fd888 · 2013-02-11T04:57:48.000-08:00
Changed wording on logging.
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
@@ -238,7 +238,7 @@ static int mmc_read_scr(struct mmc_card *card)
 
 		err = mmc_app_send_scr(card, card->raw_scr);
 		if( !err )
-			break; // sucess!!!
+			break; // success!!!
 
 		touch_nmi_watchdog();	  // we are still alive!
 
@@ -320,7 +320,7 @@ static int mmc_read_ssr(struct mmc_card *card)
 
 	if( tries > 1 )
 	{
-		pr_info("%s: could read SD Status register (SSR) at the %dth attempt\n", mmc_hostname(card->host), tries );
+		pr_info("%s: read SD Status register (SSR) after %d attempts\n", mmc_hostname(card->host), tries );
 	}
 
 	for (i = 0; i < 16; i++)

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ static int mmc_read_scr(struct mmc_card *card)`
`238`	`238`
`239`	`239`	`err = mmc_app_send_scr(card, card->raw_scr);`
`240`	`240`	`if( !err )`
`241`		`- break; // sucess!!!`
	`241`	`+ break; // success!!!`
`242`	`242`
`243`	`243`	`touch_nmi_watchdog(); // we are still alive!`
`244`	`244`
`@@ -320,7 +320,7 @@ static int mmc_read_ssr(struct mmc_card *card)`
`320`	`320`
`321`	`321`	`if( tries > 1 )`
`322`	`322`	`{`
`323`		`- pr_info("%s: could read SD Status register (SSR) at the %dth attempt\n", mmc_hostname(card->host), tries );`
	`323`	`+ pr_info("%s: read SD Status register (SSR) after %d attempts\n", mmc_hostname(card->host), tries );`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`for (i = 0; i < 16; i++)`