Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fsverity/linux

[linux-2.6-microblaze.git] / drivers / block / n64cart.c

diff --git a/drivers/block/n64cart.c b/drivers/block/n64cart.c
index d914156..27b2187 100644 (file)
--- a/drivers/block/n64cart.c
+++ b/drivers/block/n64cart.c
@@ -114,6 +114,10 @@ static const struct block_device_operations n64cart_fops = {
  */
 static int __init n64cart_probe(struct platform_device *pdev)
 {
+       struct queue_limits lim = {
+               .physical_block_size    = 4096,
+               .logical_block_size     = 4096,
+       };
        struct gendisk *disk;
        int err = -ENOMEM;
 
@@ -131,9 +135,11 @@ static int __init n64cart_probe(struct platform_device *pdev)
        if (IS_ERR(reg_base))
                return PTR_ERR(reg_base);
 
-       disk = blk_alloc_disk(NUMA_NO_NODE);
-       if (!disk)
+       disk = blk_alloc_disk(&lim, NUMA_NO_NODE);
+       if (IS_ERR(disk)) {
+               err = PTR_ERR(disk);
                goto out;
+       }
 
        disk->first_minor = 0;
        disk->flags = GENHD_FL_NO_PART;
@@ -145,8 +151,6 @@ static int __init n64cart_probe(struct platform_device *pdev)
        set_disk_ro(disk, 1);
 
        blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
-       blk_queue_physical_block_size(disk->queue, 4096);
-       blk_queue_logical_block_size(disk->queue, 4096);
 
        err = add_disk(disk);
        if (err)