Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Add UNPLUG traces to all appropriate places
  block: fix requeue handling in blk_queue_invalidate_tags()
  mmc: Fix sg helper copy-and-paste error
  pktcdvd: fix BUG caused by sysfs module reference semantics change
  ioprio: allow sys_ioprio_set() value of 0 to reset ioprio setting
  cfq_idle_class_timer: add paranoid checks for jiffies overflow
  cfq: fix IOPRIO_CLASS_IDLE delays
  cfq: fix IOPRIO_CLASS_IDLE accounting

1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index a8130a4ad6d4..a5ee21319d37 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -358,10 +358,19 @@ static ssize_t class_pktcdvd_store_add(struct class *c, const char *buf,
                                         size_t count)
 {
         unsigned int major, minor;
+
         if (sscanf(buf, "%u:%u", &major, &minor) == 2) {
+                /* pkt_setup_dev() expects caller to hold reference to self */
+                if (!try_module_get(THIS_MODULE))
+                        return -ENODEV;
+
                 pkt_setup_dev(MKDEV(major, minor), NULL);
+
+                module_put(THIS_MODULE);
+
                 return count;
         }
+
         return -EINVAL;
 }