2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 9364dc554257..9f7c543cc04b 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1693,6 +1693,11 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time)
         for (i = 0; i <= h->highest_lun; i++) {
                 int j;
                 drv_found = 0;
+
+                /* skip holes in the array from already deleted drives */
+                if (h->drv[i].raid_level == -1)
+                        continue;
+
                 for (j = 0; j < num_luns; j++) {
                         memcpy(&lunid, &ld_buff->LUN[j][0], 4);
                         lunid = le32_to_cpu(lunid);
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index f20bf359b84f..dc7a8c352da2 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -302,7 +302,7 @@ static struct kobj_type kobj_pkt_type_wqueue = {
 static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)
 {
         if (class_pktcdvd) {
-                pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL,
+                pd->dev = device_create(class_pktcdvd, NULL, MKDEV(0, 0), NULL,
                                         "%s", pd->name);
                 if (IS_ERR(pd->dev))
                         pd->dev = NULL;
@@ -2790,7 +2790,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
         return 0;
 
 out_mem:
-        blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
+        blkdev_put(bdev, FMODE_READ | FMODE_NDELAY);
         /* This is safe: open() is still holding a reference. */
         module_put(THIS_MODULE);
         return ret;
@@ -2975,7 +2975,7 @@ static int pkt_remove_dev(dev_t pkt_dev)
         pkt_debugfs_dev_remove(pd);
         pkt_sysfs_dev_remove(pd);
 
-        blkdev_put(pd->bdev, FMODE_READ|FMODE_WRITE);
+        blkdev_put(pd->bdev, FMODE_READ | FMODE_NDELAY);
 
         remove_proc_entry(pd->name, pkt_proc);
         DPRINTK(DRIVER_NAME": writer %s unmapped\n", pd->name);