d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cam: Fix GENERIC-MMCCAM build

Browse Source 
Fix forgotten argument and type error. MMCCAM isn't enabled by default,
and I'd mistakenly thought it was, so these went undetected precommit.

Sponsored by:		Netflix
This commit is contained in:
Warner Losh 2021-06-28 17:22:35 -06:00
parent 9f0febd6a4
commit a72af82e31
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cam/mmc/mmc_sim.c
View File

@ -206,7 +206,7 @@ mmc_cam_sim_alloc(device_t dev, const char *name, struct mmc_sim *mmc_sim)
mtx_init(&mmc_sim->mtx, sim_name, NULL, MTX_DEF);
mmc_sim->sim = cam_sim_alloc(mmc_cam_sim_default_action,
mmc_cam_default_poll,
name, mmc_sim,
name, mmc_sim, device_get_unit(dev),
&mmc_sim->mtx, 1, 1, mmc_sim->devq);
if (mmc_sim->sim == NULL) {

2
sys/cam/mmc/mmc_xpt.c
View File

@ -419,7 +419,7 @@ mmccam_start_discovery(struct cam_sim *sim)
return;
}
KASSERT(xpt_path_sim_device(&ccb->ccb_h.path) != NULL,
KASSERT(xpt_path_sim_device(ccb->ccb_h.path) != NULL,
("%s(%s): device is not initialized on sim's path",
__func__, cam_sim_name(sim)));
xpt_rescan(ccb);

2
sys/dev/sdhci/sdhci.c
View File

@ -2484,7 +2484,7 @@ sdhci_start_slot(struct sdhci_slot *slot)
mtx_init(&slot->sim_mtx, "sdhcisim", NULL, MTX_DEF);
slot->sim = cam_sim_alloc(sdhci_cam_action, sdhci_cam_poll,
"sdhci_slot", slot,
"sdhci_slot", slot, device_get_unit(slot->dev),
&slot->sim_mtx, 1, 1, slot->devq);
if (slot->sim == NULL) {