From c97748fe5a699431c1d28d8dbb66656ba3390914 Mon Sep 17 00:00:00 2001 From: Thomas Maier Date: Wed, 4 Oct 2006 02:15:30 -0700 Subject: [PATCH] --- yaml --- r: 38348 b: refs/heads/master c: add216608a63713b8a2c4545698d5ae02e27ac3b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/pktcdvd.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 08a89c831ede..b1fa1248b5f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7822082d4e054fbdec8cf26590a350e3496c5cc9 +refs/heads/master: add216608a63713b8a2c4545698d5ae02e27ac3b diff --git a/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c index 8a73a054a15a..f2904f67af47 100644 --- a/trunk/drivers/block/pktcdvd.c +++ b/trunk/drivers/block/pktcdvd.c @@ -82,7 +82,7 @@ static struct pktcdvd_device *pkt_devs[MAX_WRITERS]; static struct proc_dir_entry *pkt_proc; -static int pkt_major; +static int pktdev_major; static struct mutex ctl_mutex; /* Serialize open/close/setup/teardown */ static mempool_t *psd_pool; @@ -2476,7 +2476,7 @@ static int pkt_setup_dev(struct pkt_ctrl_command *ctrl_cmd) init_waitqueue_head(&pd->wqueue); pd->bio_queue = RB_ROOT; - disk->major = pkt_major; + disk->major = pktdev_major; disk->first_minor = idx; disk->fops = &pktcdvd_ops; disk->flags = GENHD_FL_REMOVABLE; @@ -2625,13 +2625,13 @@ static int __init pkt_init(void) if (!psd_pool) return -ENOMEM; - ret = register_blkdev(pkt_major, DRIVER_NAME); + ret = register_blkdev(pktdev_major, DRIVER_NAME); if (ret < 0) { printk(DRIVER_NAME": Unable to register block device\n"); goto out2; } - if (!pkt_major) - pkt_major = ret; + if (!pktdev_major) + pktdev_major = ret; ret = misc_register(&pkt_misc); if (ret) { @@ -2646,7 +2646,7 @@ static int __init pkt_init(void) return 0; out: - unregister_blkdev(pkt_major, DRIVER_NAME); + unregister_blkdev(pktdev_major, DRIVER_NAME); out2: mempool_destroy(psd_pool); return ret; @@ -2656,7 +2656,7 @@ static void __exit pkt_exit(void) { remove_proc_entry(DRIVER_NAME, proc_root_driver); misc_deregister(&pkt_misc); - unregister_blkdev(pkt_major, DRIVER_NAME); + unregister_blkdev(pktdev_major, DRIVER_NAME); mempool_destroy(psd_pool); }