aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorAlexander Motin <mav@FreeBSD.org>2010-02-23 16:39:53 +0000
committerAlexander Motin <mav@FreeBSD.org>2010-02-23 16:39:53 +0000
commit5261b668c1e53f11cb16687be397525aea27cb42 (patch)
tree07695a5fc9bd67cc6860ea95686b9c7634af8908 /sys/dev/ata
parentb8bba24e066cce6a16d4466a5a47efd0df364da4 (diff)
Notes
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/ata-all.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index 0195781cd29b..73dfa94fd83e 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -289,15 +289,13 @@ static void
ata_conn_event(void *context, int dummy)
{
device_t dev = (device_t)context;
- struct ata_channel *ch = device_get_softc(dev);
#ifdef ATA_CAM
+ struct ata_channel *ch = device_get_softc(dev);
union ccb *ccb;
-#endif
mtx_lock(&ch->state_mtx);
ata_reinit(dev);
mtx_unlock(&ch->state_mtx);
-#ifdef ATA_CAM
if ((ccb = xpt_alloc_ccb()) == NULL)
return;
if (xpt_create_path(&ccb->ccb_h.path, NULL,
@@ -307,6 +305,8 @@ ata_conn_event(void *context, int dummy)
return;
}
xpt_rescan(ccb);
+#else
+ ata_reinit(dev);
#endif
}