modified block device name for sdcard

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index ae4aebcbd6c34af1ce2710278f56a24523a4bcf9..5b89f37b81ec926a314f73d7ad3866e458594456 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -403,7 +403,7 @@ static struct scsi_driver sd_template = {
        .owner                  = THIS_MODULE,
        .gendrv = {
 //             .name           = "sd",
-               .name           = "mmcblk",
+               .name           = "emul_mmcblk",
                .probe          = sd_probe,
                .remove         = sd_remove,
                .suspend        = sd_suspend,
@@ -1503,7 +1503,7 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                 * error.
                 */
 //             scsi_print_sense("sd", SCpnt);
-               scsi_print_sense("mmcblk", SCpnt);
+               scsi_print_sense("emul_mmcblk", SCpnt);
                SCpnt->result = 0;
                memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
                break;
@@ -2695,7 +2695,7 @@ static int sd_probe(struct device *dev)
        }
 
 //     error = sd_format_disk_name("sd", index, gd->disk_name, DISK_NAME_LEN);
-       error = sd_format_disk_name("mmcblk", index, gd->disk_name, DISK_NAME_LEN);
+       error = sd_format_disk_name("emul_mmcblk", index, gd->disk_name, DISK_NAME_LEN);
        if (error) {
                sdev_printk(KERN_WARNING, sdp, "SCSI disk (sd) name length exceeded.\n");
                goto out_free_index;
@@ -2913,7 +2913,7 @@ static int __init init_sd(void)
 
        for (i = 0; i < SD_MAJORS; i++)
 //             if (register_blkdev(sd_major(i), "sd") == 0)
-               if (register_blkdev(sd_major(i), "mmcblk") == 0)
+               if (register_blkdev(sd_major(i), "emul_mmcblk") == 0)
                        majors++;
 
        if (!majors)
@@ -2950,7 +2950,7 @@ err_out_class:
 err_out:
        for (i = 0; i < SD_MAJORS; i++)
 //             unregister_blkdev(sd_major(i), "sd");
-               unregister_blkdev(sd_major(i), "mmcblk");
+               unregister_blkdev(sd_major(i), "emul_mmcblk");
        return err;
 }
 
@@ -2973,7 +2973,7 @@ static void __exit exit_sd(void)
 
        for (i = 0; i < SD_MAJORS; i++)
 //             unregister_blkdev(sd_major(i), "sd");
-               unregister_blkdev(sd_major(i), "mmcblk");
+               unregister_blkdev(sd_major(i), "emul_mmcblk");
 }
 
 module_init(init_sd);

diff --git a/package/changelog b/package/changelog
index 9fe63b3fc7319c7a4b896a564aac7e72205dcb10..06432a2ea887eb32c4a0fc1aee90917eecb02adf 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.4.13
+- modified block device name for sdcard
+== Sungmin Ha <sungmin82.ha@samsung.com> 2013-01-21
 * 1.4.12
 - Fixed a bug does not close when the device has been shut down with no streaming data.
 == Jinhyung Jo <jinhyung.jo@samsung.com> 2013-01-15

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index dfc0187b92d66e19aead3acbe408573c65df0404..55318ecd33f87b293ceb77b4eb02fbf7a42f3387 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version: 1.4.12
+Version: 1.4.13
 Maintainer: Yeong-Kyoon, Lee <yeongkyoon.lee@samsung.com>
 Source: emulator-kernel