diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:30:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:30:40 -0400 |
| commit | 029f5468b5b5f93a09bf90326fdcb9124079658d (patch) | |
| tree | f869fb02ad1ca49e0920e073b22cbb96a184ccae /drivers/scsi/sata_mv.c | |
| parent | 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110 (diff) | |
| parent | 1ad8e7f9eb051b040880e45337ed74bfd916ef7f (diff) | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_vsc.c
include/linux/libata.h
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index dc54f294fac8..fd9f2173f062 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -1397,7 +1397,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant, | |||
| 1397 | } | 1397 | } |
| 1398 | } | 1398 | } |
| 1399 | 1399 | ||
| 1400 | if (ap && (ap->flags & ATA_FLAG_PORT_DISABLED)) | 1400 | if (ap && (ap->flags & ATA_FLAG_DISABLED)) |
| 1401 | continue; | 1401 | continue; |
| 1402 | 1402 | ||
| 1403 | err_mask = ac_err_mask(ata_status); | 1403 | err_mask = ac_err_mask(ata_status); |