From 890b6a7a84ab1f17e144b8e9d0ea0f3af92be306 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Thu, 4 Sep 2003 20:53:20 -0700 Subject: [PATCH] [PATCH] large dev_t - second series (2/15) floppy98 ->probe() forgot to set *part to 0; fixed. --- drivers/block/floppy98.c | 1 + fs/partitions/nec98.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/floppy98.c b/drivers/block/floppy98.c index d861fdbc34669..9513de5f11cfb 100644 --- a/drivers/block/floppy98.c +++ b/drivers/block/floppy98.c @@ -4249,6 +4249,7 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data) return NULL; if (((*part>>2) & 0x1f) >= NUMBER(floppy_type)) return NULL; + *part = 0; return get_disk(disks[drive]); } diff --git a/fs/partitions/nec98.c b/fs/partitions/nec98.c index 5f78e5b4895c5..08c72aecea1ff 100644 --- a/fs/partitions/nec98.c +++ b/fs/partitions/nec98.c @@ -73,10 +73,9 @@ int nec98_partition(struct parsed_partitions *state, struct block_device *bdev) const struct nec98_partition *part; unsigned char *data; int sector_size = bdev_hardsect_size(bdev); - int major = MAJOR(bdev->bd_dev); if (ioctl_by_bdev(bdev, HDIO_GETGEO, (unsigned long)&geo) != 0) { - printk(" unsupported disk (major = %u)\n", major); + printk(" unsupported disk (%s)\n", bdev->bd_disk->disk_name); return 0; } -- 2.53.0