From 366b477c07f43d74e45bac8f4a0cf9d292a2ef93 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@redhat.com>
Date: Sat, 17 Feb 2007 02:40:20 +0100
Subject: [PATCH] --- yaml --- r: 48804 b: refs/heads/master c:
 fdb77da4ca68ae17a39d58c9d5c00479a7e124c0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b05ee3ad5fd7..8dd4e3127670 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39baf8a798926eb675c9360d5822ca86ed92866e
+refs/heads/master: fdb77da4ca68ae17a39d58c9d5c00479a7e124c0
diff --git a/trunk/drivers/ide/ide-floppy.c b/trunk/drivers/ide/ide-floppy.c
index d33717c8afd4..07fa37d84df2 100644
--- a/trunk/drivers/ide/ide-floppy.c
+++ b/trunk/drivers/ide/ide-floppy.c
@@ -1433,7 +1433,8 @@ static int idefloppy_get_capacity (ide_drive_t *drive)
 	
 	drive->bios_cyl = 0;
 	drive->bios_head = drive->bios_sect = 0;
-	floppy->blocks = floppy->bs_factor = 0;
+	floppy->blocks = 0;
+	floppy->bs_factor = 1;
 	set_capacity(floppy->disk, 0);
 
 	idefloppy_create_read_capacity_cmd(&pc);