From 49d15f87984a698cf1592e8e3849a902c150bcbb Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@redhat.com>
Date: Sun, 26 Sep 2010 12:23:25 +0900
Subject: [PATCH] --- yaml --- r: 213092 b: refs/heads/master c:
 504c6d1b44bc6e694bdba8d9a2a4e046275b5e2b h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/block/amiflop.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3e6dd0f24d8a..3c45dc3bca21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 639e2f2aa76eefaf22078dccbbf2f3483f587aa7
+refs/heads/master: 504c6d1b44bc6e694bdba8d9a2a4e046275b5e2b
diff --git a/trunk/drivers/block/amiflop.c b/trunk/drivers/block/amiflop.c
index ead8b7792c52..327ed27dfe1a 100644
--- a/trunk/drivers/block/amiflop.c
+++ b/trunk/drivers/block/amiflop.c
@@ -1347,12 +1347,12 @@ static struct request *set_next_request(void)
 	if (fdc_queue == FD_MAX_UNITS)
 		fdc_queue = 0;
 
-	for(cnt = FD_MAX_UNITS; cnt > 0, cnt--) {
+	for(cnt = FD_MAX_UNITS; cnt > 0; cnt--) {
 
 		if (unit[fdc_queue].type->code == FD_NODRIVE) {
 			if (++fdc_queue == FD_MAX_UNITS)
 				fdc_queue = 0;
-			cotinue;
+			continue;
 		}
 
 		q = unit[fdc_queue].gendisk->queue;
@@ -1827,7 +1827,6 @@ static int __init amiga_floppy_probe(struct platform_device *pdev)
 	return 0;
 
 out_probe:
-out_queue:
 	free_irq(IRQ_AMIGA_CIAA_TB, NULL);
 out_irq2:
 	free_irq(IRQ_AMIGA_DSKBLK, NULL);