From f95a7dfde3d57306344a8dc7155c3a0c3ccacd09 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 22 Apr 2011 14:55:19 -0700 Subject: [PATCH] --- yaml --- r: 249138 b: refs/heads/master c: d49198299928122d98ae7ca35dd824eaf8746ccd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/blkvsc_drv.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index fd884fdeccc8..e668d57a1826 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c8d0b7decd42e7cb5e5118f8d2f0bf3f39ba52a +refs/heads/master: d49198299928122d98ae7ca35dd824eaf8746ccd diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c index 7974e6c0f88a..92614d5ec8d0 100644 --- a/trunk/drivers/staging/hv/blkvsc_drv.c +++ b/trunk/drivers/staging/hv/blkvsc_drv.c @@ -437,8 +437,6 @@ static int blkvsc_do_operation(struct block_device_context *blkdev, if (device_type == 0x0) blkdev->device_type = HARDDISK_TYPE; - else if (device_type == 0x5) - blkdev->device_type = DVD_TYPE; else blkdev->device_type = UNKNOWN_DEV_TYPE; @@ -1076,12 +1074,7 @@ static int blkvsc_probe(struct device *device) sprintf(blkdev->gd->disk_name, "hd%c", 'a' + devnum); blkvsc_do_operation(blkdev, DO_INQUIRY); - if (blkdev->device_type == DVD_TYPE) { - set_disk_ro(blkdev->gd, 1); - blkdev->gd->flags |= GENHD_FL_REMOVABLE; - blkvsc_do_operation(blkdev, DO_CAPACITY); - } else - blkvsc_do_operation(blkdev, DO_CAPACITY); + blkvsc_do_operation(blkdev, DO_CAPACITY); set_capacity(blkdev->gd, blkdev->capacity * (blkdev->sector_size/512)); blk_queue_logical_block_size(blkdev->gd->queue, blkdev->sector_size);