aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorPeter Grehan <grehan@FreeBSD.org>2013-10-10 22:46:49 +0000
committerPeter Grehan <grehan@FreeBSD.org>2013-10-10 22:46:49 +0000
commit99a5e5a7b422e045a8443a47d6133073341c64b3 (patch)
tree956c6c348f5b1d1f54fdbb4a152f2e30954a93a9 /sys/dev/ata
parent721cdb10534dd8fa7d44b947721c39dcc749779f (diff)
downloadsrc-99a5e5a7b422e045a8443a47d6133073341c64b3.tar.gz
src-99a5e5a7b422e045a8443a47d6133073341c64b3.zip
Allow the legacy CDROM device to be accessed in a FreeBSD guest, while
still using enlightened drivers for other block devices. Submitted by: Microsoft hyperv dev team, mav@ Approved by: re@
Notes
Notes: svn path=/head/; revision=256304
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/ata-all.c2
-rw-r--r--sys/dev/ata/ata-card.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index cfd025f17086..4860faf5072c 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -92,7 +92,7 @@ FEATURE(ata_cam, "ATA devices are accessed through the cam(4) driver");
int
ata_probe(device_t dev)
{
- return 0;
+ return (BUS_PROBE_DEFAULT);
}
int
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index eb49c2cb4564..5346b8fd717e 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -140,7 +140,7 @@ ata_pccard_attach(device_t dev)
ch-> flags |= ATA_NO_SLAVE;
ata_generic_hw(dev);
err = ata_probe(dev);
- if (err)
+ if (err > 0)
return (err);
return (ata_attach(dev));
}