diff options
Diffstat (limited to 'drivers/scsi/aic7xxx')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 1 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_pci.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c index cb30d9c1153d..0c9c2f400bf6 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | |||
@@ -219,6 +219,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
219 | ahc->flags |= AHC_39BIT_ADDRESSING; | 219 | ahc->flags |= AHC_39BIT_ADDRESSING; |
220 | } else { | 220 | } else { |
221 | if (dma_set_mask(dev, DMA_32BIT_MASK)) { | 221 | if (dma_set_mask(dev, DMA_32BIT_MASK)) { |
222 | ahc_free(ahc); | ||
222 | printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n"); | 223 | printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n"); |
223 | return (-ENODEV); | 224 | return (-ENODEV); |
224 | } | 225 | } |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_pci.c b/drivers/scsi/aic7xxx/aic7xxx_pci.c index 02fed4a02eb3..63cab2d74552 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_pci.c +++ b/drivers/scsi/aic7xxx/aic7xxx_pci.c | |||
@@ -2042,12 +2042,12 @@ ahc_pci_resume(struct ahc_softc *ahc) | |||
2042 | * that the OS doesn't know about and rely on our chip | 2042 | * that the OS doesn't know about and rely on our chip |
2043 | * reset handler to handle the rest. | 2043 | * reset handler to handle the rest. |
2044 | */ | 2044 | */ |
2045 | ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4, | 2045 | ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, |
2046 | ahc->bus_softc.pci_softc.devconfig); | 2046 | ahc->bus_softc.pci_softc.devconfig, /*bytes*/4); |
2047 | ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1, | 2047 | ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, |
2048 | ahc->bus_softc.pci_softc.command); | 2048 | ahc->bus_softc.pci_softc.command, /*bytes*/1); |
2049 | ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1, | 2049 | ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, |
2050 | ahc->bus_softc.pci_softc.csize_lattime); | 2050 | ahc->bus_softc.pci_softc.csize_lattime, /*bytes*/1); |
2051 | if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) { | 2051 | if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) { |
2052 | struct seeprom_descriptor sd; | 2052 | struct seeprom_descriptor sd; |
2053 | u_int sxfrctl1; | 2053 | u_int sxfrctl1; |