Skip to content

Commit

Permalink
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv HighPoint 2310 support (88SX7042)
  libata: fix handling of port actions in per-dev action mask
  libata: initialize qc->dma_dir to DMA_NONE
  sata_via: add PCI ID 0x5337
  libata doc: "error : unterminated entity reference exceptions"
  • Loading branch information
Linus Torvalds committed Jan 22, 2007
2 parents 365bbe0 + e93f09d commit ab11278
Showing 5 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Documentation/DocBook/libata.tmpl
Original file line number Diff line number Diff line change
@@ -883,7 +883,7 @@ and other resources, etc.
</chapter>

<chapter id="ataExceptions">
<title>ATA errors &amp; exceptions</title>
<title>ATA errors and exceptions</title>

<para>
This chapter tries to identify what error/exception conditions exist
4 changes: 4 additions & 0 deletions drivers/ata/libata-eh.c
Original file line number Diff line number Diff line change
@@ -1979,6 +1979,10 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,

ehc->tries[dev->devno] = ATA_EH_DEV_TRIES;

/* collect port action mask recorded in dev actions */
ehc->i.action |= ehc->i.dev_action[i] & ~ATA_EH_PERDEV_MASK;
ehc->i.dev_action[i] &= ATA_EH_PERDEV_MASK;

/* process hotplug request */
if (dev->flags & ATA_DFLAG_DETACH)
ata_eh_detach_dev(dev);
5 changes: 3 additions & 2 deletions drivers/ata/sata_mv.c
Original file line number Diff line number Diff line change
@@ -523,8 +523,7 @@ static const struct ata_port_info mv_port_info[] = {
},
{ /* chip_7042 */
.sht = &mv_sht,
.flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS |
MV_FLAG_DUAL_HC),
.flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS),
.pio_mask = 0x1f, /* pio0-4 */
.udma_mask = 0x7f, /* udma0-6 */
.port_ops = &mv_iie_ops,
@@ -545,6 +544,8 @@ static const struct pci_device_id mv_pci_tbl[] = {

{ PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },

{ PCI_VDEVICE(TTI, 0x2310), chip_7042 },

{ } /* terminate list */
};

1 change: 1 addition & 0 deletions drivers/ata/sata_via.c
Original file line number Diff line number Diff line change
@@ -77,6 +77,7 @@ static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
static void vt6420_error_handler(struct ata_port *ap);

static const struct pci_device_id svia_pci_tbl[] = {
{ PCI_VDEVICE(VIA, 0x5337), vt6420 },
{ PCI_VDEVICE(VIA, 0x0591), vt6420 },
{ PCI_VDEVICE(VIA, 0x3149), vt6420 },
{ PCI_VDEVICE(VIA, 0x3249), vt6421 },
1 change: 1 addition & 0 deletions include/linux/libata.h
Original file line number Diff line number Diff line change
@@ -1143,6 +1143,7 @@ static inline void ata_tf_init(struct ata_device *dev, struct ata_taskfile *tf)

static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
{
qc->dma_dir = DMA_NONE;
qc->__sg = NULL;
qc->flags = 0;
qc->cursect = qc->cursg = qc->cursg_ofs = 0;

0 comments on commit ab11278

Please sign in to comment.