From c7f13457a14cc353bde0ffc10a646242aabf9bd7 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Mon, 18 Jan 2010 18:17:03 +0100 Subject: [PATCH] --- yaml --- r: 183171 b: refs/heads/master c: f777582f4963413320ce5fe1d1d3651a32075c07 h: refs/heads/master i: 183169: 9b289b2ffc754ce44a1dbf90a934b8446f5c3cad 183167: 2757de75fec6f1e470a7de27ae4114160be6d4af v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_via.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e9a3b425f0f0..525ee812cb9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfcf9ee26a5991f0786d24b4bd334b103d06268e +refs/heads/master: f777582f4963413320ce5fe1d1d3651a32075c07 diff --git a/trunk/drivers/ata/pata_via.c b/trunk/drivers/ata/pata_via.c index 0d97890af681..82e75a1f1b95 100644 --- a/trunk/drivers/ata/pata_via.c +++ b/trunk/drivers/ata/pata_via.c @@ -229,7 +229,7 @@ static int via_pre_reset(struct ata_link *link, unsigned long deadline) /** - * via_do_set_mode - set initial PIO mode data + * via_do_set_mode - set transfer mode data * @ap: ATA interface * @adev: ATA device * @mode: ATA mode being programmed @@ -273,7 +273,7 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo pci_read_config_byte(pdev, 0x4C, &setup); setup &= ~(3 << shift); - setup |= clamp_val(t.setup, 1, 4) << shift; /* 1,4 or 1,4 - 1 FIXME */ + setup |= (clamp_val(t.setup, 1, 4) - 1) << shift; pci_write_config_byte(pdev, 0x4C, setup); }