diff options
author | marius <marius@FreeBSD.org> | 2012-06-14 22:19:23 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2012-06-14 22:19:23 +0000 |
commit | 924ef2a7f39c06df352467e4e5f1b738d37befe6 (patch) | |
tree | 1ca3b8a26845db297e80a829f7c261d6568e9af0 /sys | |
parent | eea1bdf2c79434e329e79980856cd5eb81bfe73f (diff) | |
download | FreeBSD-src-924ef2a7f39c06df352467e4e5f1b738d37befe6.zip FreeBSD-src-924ef2a7f39c06df352467e4e5f1b738d37befe6.tar.gz |
- As a baind-aid, disable ATAPI DMA when using ATA_CAM for these controllers
as well as it causes the kernel to hang during boot.
Reported and tested by: Kevin Oberman
- Use NULL instead of 0 for a pointer.
MFC after: 3 days
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/ata/chipsets/ata-ite.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/ata/chipsets/ata-ite.c b/sys/dev/ata/chipsets/ata-ite.c index fe6ff21..3f890fd 100644 --- a/sys/dev/ata/chipsets/ata-ite.c +++ b/sys/dev/ata/chipsets/ata-ite.c @@ -105,10 +105,10 @@ ata_ite_chipinit(device_t dev) ctlr->setmode = ata_ite_821x_setmode; /* No timing restrictions initally. */ - ctlr->chipset_data = (void *)0; + ctlr->chipset_data = NULL; } ctlr->ch_attach = ata_ite_ch_attach; - return 0; + return (0); } static int @@ -119,6 +119,9 @@ ata_ite_ch_attach(device_t dev) error = ata_pci_ch_attach(dev); ch->flags |= ATA_CHECKS_CABLE; +#ifdef ATA_CAM + ch->flags |= ATA_NO_ATAPI_DMA; +#endif return (error); } |