linux-2.6-miscfix.patch

   1 diff -urN linux-2.6.0-test3.org/drivers/block/paride/pd.c linux-2.6.0-test3/drivers/block/paride/pd.c
   2 --- linux-2.6.0-test3.org/drivers/block/paride/pd.c     2003-08-10 14:31:43.000000000 +0000
   3 +++ linux-2.6.0-test3/drivers/block/paride/pd.c 2003-08-10 14:41:00.000000000 +0000
   4 @@ -654,7 +654,7 @@
   5         return pd_identify(disk);
   6  }
   7
   8 -static struct request_queue pd_queue;
   9 +static struct request_queue *pd_queue;
  10
  11  static int pd_detect(void)
  12  {
  13 @@ -704,7 +704,7 @@
  14                         set_capacity(p, disk->capacity);
  15                         disk->gd = p;
  16                         p->private_data = disk;
  17 -                       p->queue = &pd_queue;
  18 +                       p->queue = pd_queue;
  19                         add_disk(p);
  20                 }
  21         }
  22 @@ -782,7 +782,7 @@
  23         spin_lock_irqsave(&pd_lock, saved_flags);
  24         end_request(pd_req, success);
  25         pd_busy = 0;
  26 -       do_pd_request(&pd_queue);
  27 +       do_pd_request(pd_queue);
  28         spin_unlock_irqrestore(&pd_lock, saved_flags);
  29  }
  30
  31 @@ -893,8 +893,12 @@
  32         if (register_blkdev(major, name))
  33                 return -1;
  34
  35 -       blk_init_queue(&pd_queue, do_pd_request, &pd_lock);
  36 -       blk_queue_max_sectors(&pd_queue, cluster);
  37 +       pd_queue = blk_init_queue(do_pd_request, &pd_lock);
  38 +       if (!pd_queue) {
  39 +               unregister_blkdev(major,name);
  40 +               return -1;
  41 +       }
  42 +       blk_queue_max_sectors(pd_queue, cluster);
  43
  44         printk("%s: %s version %s, major %d, cluster %d, nice %d\n",
  45                name, name, PD_VERSION, major, cluster, nice);
  46 @@ -920,7 +924,7 @@
  47                         pi_release(disk->pi);
  48                 }
  49         }
  50 -       blk_cleanup_queue(&pd_queue);
  51 +       blk_cleanup_queue(pd_queue);
  52  }
  53
  54  MODULE_LICENSE("GPL");