From 63fb9c2b6b359fc33e6a0a59101ffd856aacc58c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sat, 27 Jan 2007 13:46:21 +0100
Subject: [PATCH] --- yaml --- r: 45961 b: refs/heads/master c:
 a51545ab2523b9cfd426737495f877821006371a h: refs/heads/master i:   45959:
 fc71263582c2fc287e2c9b4a246f31d46bf637a8 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ide/pci/jmicron.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index edfc6199390e..59256ba413f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e7106fc7ea6af9c365afe2bfcde57cb1fdd1093
+refs/heads/master: a51545ab2523b9cfd426737495f877821006371a
diff --git a/trunk/drivers/ide/pci/jmicron.c b/trunk/drivers/ide/pci/jmicron.c
index c1cec236ecf0..35dda8fcd0ac 100644
--- a/trunk/drivers/ide/pci/jmicron.c
+++ b/trunk/drivers/ide/pci/jmicron.c
@@ -93,8 +93,9 @@ static int __devinit ata66_jmicron(ide_hwif_t *hwif)
 			return 0;
 		return 1;
 	case PORT_SATA:
-		return 1;
+		break;
 	}
+	return 1; /* Avoid bogus "control reaches end of non-void function" */
 }
 
 static void jmicron_tuneproc (ide_drive_t *drive, byte mode_wanted)