[PATCH] large dev_t - second series (2/15)

	floppy98 ->probe() forgot to set *part to 0; fixed.

diff --git a/drivers/block/floppy98.c b/drivers/block/floppy98.c
index d861fdbc34669a7fb22b340a4b4bd735ddc053a2..9513de5f11cfb0d69d8d6b65134f5eb08cc2d29a 100644 (file)
--- 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 5f78e5b4895c53f2c480a6f67dab3d3cc96bb0bd..08c72aecea1ff3ffca087a5a38985e287df3782f 100644 (file)
--- 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;
        }