summaryrefslogtreecommitdiffstats
path: root/drivers/block/viodasd.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-07-11 05:28:26 +0200
committerPaul Mackerras <paulus@samba.org>2007-07-11 05:28:26 +0200
commitbf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch)
tree14085d90de0428316479fe6de8a0c6d32e6e65e2 /drivers/block/viodasd.c
parentlots-of-architectures: enable arbitary speed tty support (diff)
parent[POWERPC] Create add_rtc() function to enable the RTC CMOS driver (diff)
downloadlinux-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.tar.xz
linux-bf22f6fe2d72b4d7e9035be8ceb340414cf490e3.zip
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'drivers/block/viodasd.c')
-rw-r--r--drivers/block/viodasd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 68592c336011..dae39911a11d 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -252,10 +252,10 @@ static int viodasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
struct gendisk *disk = bdev->bd_disk;
struct viodasd_device *d = disk->private_data;
- geo->sectors = d->sectors ? d->sectors : 0;
+ geo->sectors = d->sectors ? d->sectors : 32;
geo->heads = d->tracks ? d->tracks : 64;
geo->cylinders = d->cylinders ? d->cylinders :
- get_capacity(disk) / (geo->cylinders * geo->heads);
+ get_capacity(disk) / (geo->sectors * geo->heads);
return 0;
}