diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2013-04-14 09:55:48 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2013-04-14 09:55:48 +0000 |
| commit | e5dfa058dab8fa6b71f15a4212dc1ec68b04bfea (patch) | |
| tree | df9949ed179b54ed307f0058d4d461e9e3179b33 /sys/dev/firewire | |
| parent | cccf422080e22281bbcb96e29128a89ce00cd4d4 (diff) | |
| download | src-e5dfa058dab8fa6b71f15a4212dc1ec68b04bfea.tar.gz src-e5dfa058dab8fa6b71f15a4212dc1ec68b04bfea.zip | |
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.
Notes
Notes:
svn path=/head/; revision=249468
Diffstat (limited to 'sys/dev/firewire')
| -rw-r--r-- | sys/dev/firewire/sbp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c index 5efc5eb377b4..6b1b4a17dada 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; |