summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-05-29 16:06:54 +1000
committerPaul Mackerras <paulus@samba.org>2007-07-10 21:40:28 +1000
commit36a700307ece3ca090d1f8f071db085087ddc627 (patch)
treec061f720ccb9e85bc5377c1e0f0838800c168e6e /drivers/block
parentb8ce2272becc87894d95cbdbba42ae72115131f2 (diff)
downloadlinux-36a700307ece3ca090d1f8f071db085087ddc627.tar.gz
linux-36a700307ece3ca090d1f8f071db085087ddc627.tar.bz2
linux-36a700307ece3ca090d1f8f071db085087ddc627.zip
[POWERPC] Fix viodasd geometry calculations
Commit a885c8c4316e1c1d2d2c8755da3f3d14f852528d that introduced the getgeo block device method changed the fallback number of sectors and introduced a bug into the fallback cylinder number calculation. Thanks to Rusty Russell for noticing this. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/block')
-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;
}