summaryrefslogtreecommitdiffstats
path: root/sys/dev/ata/atapi-cd.c
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2009-02-28 22:07:15 +0000
committermav <mav@FreeBSD.org>2009-02-28 22:07:15 +0000
commit55cab290fcfb54ff2225bc84652ff631feca520a (patch)
treeec95ab40b5ed482c5e53ec83ecf3ff4a51f7e75c /sys/dev/ata/atapi-cd.c
parent4eafa084fe4aba2a485ea0c0d8e047b253977e9d (diff)
downloadFreeBSD-src-55cab290fcfb54ff2225bc84652ff631feca520a.zip
FreeBSD-src-55cab290fcfb54ff2225bc84652ff631feca520a.tar.gz
Revert my ata_identify()/ata_reinit() related changes: r189166, r189091
and partially r188903. Revert breaks new drives detection on reinit to the state as it was before me, but fixes series of new bugs reported by some people. Unconditional queueing of ata_completed() calls can lead to deadlock if due to timeout ata_reinit() was called at the same thread by previous ata_completed(). Calling of ata_identify() on ata_reinit() in current implementation opens numerous races and deadlocks. Problems I was touching here are still exist and should be addresed, but probably in different way.
Diffstat (limited to 'sys/dev/ata/atapi-cd.c')
-rw-r--r--sys/dev/ata/atapi-cd.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index ba0c7c8..7fd80c4 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -108,18 +108,6 @@ acd_probe(device_t dev)
{
struct ata_device *atadev = device_get_softc(dev);
- if (atadev->type != ATA_T_ATAPI)
- return (ENXIO);
-
- if (!(atadev->flags & ATA_D_PROBED)) {
- atadev->flags |= ATA_D_PROBED;
- if (ata_getparam(atadev, 1) == 0)
- atadev->flags |= ATA_D_VALID;
- }
-
- if (!(atadev->flags & ATA_D_VALID))
- return (ENXIO);
-
if ((atadev->param.config & ATA_PROTO_ATAPI) &&
(atadev->param.config & ATA_ATAPI_TYPE_MASK) == ATA_ATAPI_TYPE_CDROM)
return 0;
OpenPOWER on IntegriCloud