D61013.1794662184.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D61013.1794662184.diff
View Options

	diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c
	--- a/sys/dev/sdhci/sdhci.c
	+++ b/sys/dev/sdhci/sdhci.c
	@@ -2784,9 +2784,12 @@
	ccb->ccb_h.status = CAM_REQ_CMP;
	break;
	}
	+ case XPT_SET_TRAN_SETTINGS:
	case XPT_MMC_SET_TRAN_SETTINGS:
	if (sdhci_debug > 1)
	- slot_printf(slot, "Got XPT_MMC_SET_TRAN_SETTINGS\n");
	+ slot_printf(slot, "Got XPT_%sSET_TRAN_SETTINGS\n",
	+ ccb->ccb_h.func_code == XPT_MMC_SET_TRAN_SETTINGS ?
	+ "MMC_" : "");
	if (slot->settran_ccb != NULL) {
	ccb->ccb_h.status = CAM_BUSY;
	break;
	@@ -2796,14 +2799,6 @@
	slot->settran_ccb = ccb;
	taskqueue_enqueue(slot->tq, &slot->settran_task);
	return;
	- case XPT_SET_TRAN_SETTINGS:
	- if (sdhci_debug > 1)
	- slot_printf(slot, "Got XPT_SET_TRAN_SETTINGS\n");
	- if (sdhci_cam_settran_settings(slot, ccb) != 0)
	- ccb->ccb_h.status = CAM_REQ_INVALID;
	- else
	- ccb->ccb_h.status = CAM_REQ_CMP;
	- break;
	case XPT_RESET_BUS:
	if (sdhci_debug > 1)
	slot_printf(slot, "Got XPT_RESET_BUS, ACK it...\n");