summaryrefslogtreecommitdiffstats
path: root/sys/dev/firewire/sbp.c
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2013-04-14 09:55:48 +0000
committermav <mav@FreeBSD.org>2013-04-14 09:55:48 +0000
commit3d32e6b10c85bbbaea953937412778787bba3629 (patch)
treedf9949ed179b54ed307f0058d4d461e9e3179b33 /sys/dev/firewire/sbp.c
parentf73c311ca37f75cf30157cd16614f936361e956b (diff)
downloadFreeBSD-src-3d32e6b10c85bbbaea953937412778787bba3629.zip
FreeBSD-src-3d32e6b10c85bbbaea953937412778787bba3629.tar.gz
MFprojects/camlock r248982:
Stop abusing xpt_periph in random plases that really have no periph related to CCB, for example, bus scanning. NULL value is fine in such cases and it is correctly logged in debug messages as "noperiph". If at some point we need some real XPT periphs (alike to pmpX now), quite likely they will be per-bus, and not a single global instance as xpt_periph now.
Diffstat (limited to 'sys/dev/firewire/sbp.c')
-rw-r--r--sys/dev/firewire/sbp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 5efc5eb..6b1b4a1 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -1086,7 +1086,7 @@ END_DEBUG
sbp_xfer_free(xfer);
if (sdev->path == NULL)
- xpt_create_path(&sdev->path, xpt_periph,
+ xpt_create_path(&sdev->path, NULL,
cam_sim_path(target->sbp->sim),
target->target_id, sdev->lun_id);
@@ -2039,7 +2039,7 @@ END_DEBUG
if (xpt_bus_register(sbp->sim, dev, /*bus*/0) != CAM_SUCCESS)
goto fail;
- if (xpt_create_path(&sbp->path, xpt_periph, cam_sim_path(sbp->sim),
+ if (xpt_create_path(&sbp->path, NULL, cam_sim_path(sbp->sim),
CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
xpt_bus_deregister(cam_sim_path(sbp->sim));
goto fail;
OpenPOWER on IntegriCloud