From 33ce6c9c9e830255ccca76cd9e17bf960b141157 Mon Sep 17 00:00:00 2001
From: Jason Lunz <lunz@falooley.org>
Date: Sat, 1 Sep 2007 12:06:03 -0700
Subject: [PATCH] --- yaml --- r: 64684 b: refs/heads/master c:
 fc0e01974ccccc7530b7634a63ee3fcc57b845ea h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/ata/ata_piix.c | 5 +----
 trunk/drivers/ata/sata_via.c | 2 +-
 trunk/fs/jffs2/fs.c          | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0f65d901f416..934a32949a2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4154d4a01c6cc98b97dc239ca4302316c8f98da
+refs/heads/master: fc0e01974ccccc7530b7634a63ee3fcc57b845ea
diff --git a/trunk/drivers/ata/ata_piix.c b/trunk/drivers/ata/ata_piix.c
index 3b8bf1812dc8..e40c94f5f59d 100644
--- a/trunk/drivers/ata/ata_piix.c
+++ b/trunk/drivers/ata/ata_piix.c
@@ -955,8 +955,7 @@ static int piix_broken_suspend(void)
 				DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M500"),
 			},
 		},
-
-		{ }	/* terminate list */
+		{ }
 	};
 	static const char *oemstrs[] = {
 		"Tecra M3,",
@@ -1188,8 +1187,6 @@ static void piix_iocfg_bit18_quirk(struct pci_dev *pdev)
 				DMI_MATCH(DMI_PRODUCT_NAME, "M570U"),
 			},
 		},
-
-		{ }	/* terminate list */
 	};
 	u32 iocfg;
 
diff --git a/trunk/drivers/ata/sata_via.c b/trunk/drivers/ata/sata_via.c
index 57fd30de8f0d..a4e631766eee 100644
--- a/trunk/drivers/ata/sata_via.c
+++ b/trunk/drivers/ata/sata_via.c
@@ -371,7 +371,7 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev)
 {
 	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
 	static const u8 udma_bits[] = { 0xEE, 0xE8, 0xE6, 0xE4, 0xE2, 0xE1, 0xE0, 0xE0 };
-	pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->dma_mode - XFER_UDMA_0]);
+	pci_write_config_byte(pdev, PATA_UDMA_TIMING, udma_bits[adev->pio_mode - XFER_UDMA_0]);
 }
 
 static const unsigned int svia_bar_sizes[] = {
diff --git a/trunk/fs/jffs2/fs.c b/trunk/fs/jffs2/fs.c
index 1d3b7a9fc828..8bc727b71696 100644
--- a/trunk/fs/jffs2/fs.c
+++ b/trunk/fs/jffs2/fs.c
@@ -627,7 +627,7 @@ unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
 	struct inode *inode = OFNI_EDONI_2SFFJ(f);
 	struct page *pg;
 
-	pg = read_cache_page(inode->i_mapping, offset >> PAGE_CACHE_SHIFT,
+	pg = read_cache_page_async(inode->i_mapping, offset >> PAGE_CACHE_SHIFT,
 			     (void *)jffs2_do_readpage_unlock, inode);
 	if (IS_ERR(pg))
 		return (void *)pg;