lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream' into pata-drivers

Browse Source
This commit is contained in:
Jeff Garzik
2006-08-31 00:02:26 -04:00
parent 669a5db411 9bec2e3852
commit 481ff126e8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/ahci.c
View File

@@ -1075,7 +1075,7 @@ static void ahci_host_intr(struct ata_port *ap)
return; return;
/* ignore interim PIO setup fis interrupts */ /* ignore interim PIO setup fis interrupts */
if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS))
return; return;
if (ata_ratelimit()) if (ata_ratelimit())

2
drivers/ata/pdc_adma.c
View File

@@ -497,7 +497,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host *host)
continue; continue;
DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n", DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
ap->id, qc->tf.protocol, status); ap->id, qc->tf.protocol, status);
/* complete taskfile transaction */ /* complete taskfile transaction */
pp->state = adma_state_idle; pp->state = adma_state_idle;
qc->err_mask |= ac_err_mask(status); qc->err_mask |= ac_err_mask(status);

4
include/linux/ata.h
View File

@@ -320,8 +320,8 @@ static inline unsigned int ata_id_major_version(const u16 *id)
static inline int ata_id_current_chs_valid(const u16 *id) static inline int ata_id_current_chs_valid(const u16 *id)
{ {
/* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
has not been issued to the device then the values of has not been issued to the device then the values of
id[54] to id[56] are vendor specific. */ id[54] to id[56] are vendor specific. */
return (id[53] & 0x01) && /* Current translation valid */ return (id[53] & 0x01) && /* Current translation valid */
id[54] && /* cylinders in current translation */ id[54] && /* cylinders in current translation */

2
include/linux/libata.h
View File

@@ -198,7 +198,7 @@ enum {
/* host set flags */ /* host set flags */
ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */ ATA_HOST_SIMPLEX = (1 << 0), /* Host is simplex, one DMA channel per host only */
/* various lengths of time */ /* various lengths of time */
ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */ ATA_TMOUT_BOOT = 30 * HZ, /* heuristic */
ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */ ATA_TMOUT_BOOT_QUICK = 7 * HZ, /* heuristic */