D15889.diff
No OneTemporary
Actions

Size

978 B

Referenced Files

None

Subscribers

None

D15889.diff
View Options

	Index: head/sys/cam/mmc/mmc_da.c
	===================================================================
	--- head/sys/cam/mmc/mmc_da.c
	+++ head/sys/cam/mmc/mmc_da.c
	@@ -818,6 +818,7 @@
	struct mmc_data d;

	memset(&cmd, 0, sizeof(cmd));
	+ memset(&d, 0, sizeof(d));

	memset(rawscr, 0, 8);
	cmd.opcode = ACMD_SEND_SCR;
	@@ -1296,13 +1297,13 @@
	/* Find out if the card supports High speed timing */
	if (mmcp->card_features & CARD_FEATURE_SD20) {
	/* Get and decode SCR */
	- uint32_t rawscr;
	+ uint32_t rawscr[2];
	uint8_t res[64];
	- if (mmc_app_get_scr(periph, start_ccb, &rawscr)) {
	+ if (mmc_app_get_scr(periph, start_ccb, rawscr)) {
	CAM_DEBUG(periph->path, CAM_DEBUG_PERIPH, ("Cannot get SCR\n"));
	goto finish_hs_tests;
	}
	- mmc_app_decode_scr(&rawscr, &softc->scr);
	+ mmc_app_decode_scr(rawscr, &softc->scr);

	if ((softc->scr.sda_vsn >= 1) && (softc->csd.ccc & (1<<10))) {
	mmc_sd_switch(periph, start_ccb, SD_SWITCH_MODE_CHECK,