Merge branch 'i2c/for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

[cascardo/linux.git] / drivers / memstick / core / ms_block.c

diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c
index 3cd6815..40bb8ae 100644 (file)
--- a/drivers/memstick/core/ms_block.c
+++ b/drivers/memstick/core/ms_block.c
@@ -2002,8 +2002,7 @@ static int msb_bd_getgeo(struct block_device *bdev,
 
 static int msb_prepare_req(struct request_queue *q, struct request *req)
 {
-       if (req->cmd_type != REQ_TYPE_FS &&
-                               req->cmd_type != REQ_TYPE_BLOCK_PC) {
+       if (req->cmd_type != REQ_TYPE_FS) {
                blk_dump_rq_flags(req, "MS unsupported request");
                return BLKPREP_KILL;
        }
@@ -2146,7 +2145,6 @@ static int msb_init_disk(struct memstick_dev *card)
        msb->disk->fops = &msb_bdops;
        msb->disk->private_data = msb;
        msb->disk->queue = msb->queue;
-       msb->disk->driverfs_dev = &card->dev;
        msb->disk->flags |= GENHD_FL_EXT_DEVT;
 
        capacity = msb->pages_in_block * msb->logical_block_count;
@@ -2163,7 +2161,7 @@ static int msb_init_disk(struct memstick_dev *card)
                set_disk_ro(msb->disk, 1);
 
        msb_start(card);
-       add_disk(msb->disk);
+       device_add_disk(&card->dev, msb->disk);
        dbg("Disk added");
        return 0;