2.6.0-mount-rainier-fix-lkml.patch

   1 --- drivers/scsi/sr.c~  2003-12-18 20:37:57.217540154 +0100
   2 +++ drivers/scsi/sr.c   2003-12-18 20:36:57.336012105 +0100
   3 @@ -68,7 +68,7 @@
   4          CDC_SELECT_DISC|CDC_MULTI_SESSION|CDC_MCN|CDC_MEDIA_CHANGED| \
   5          CDC_PLAY_AUDIO|CDC_RESET|CDC_IOCTLS|CDC_DRIVE_STATUS| \
   6          CDC_CD_R|CDC_CD_RW|CDC_DVD|CDC_DVD_R|CDC_DVD_RAM|CDC_GENERIC_PACKET| \
   7 -        CDC_MRW|CDC_MRW_R|CDC_RAM)
   8 +        CDC_MRW|CDC_MRW_W|CDC_RAM)
   9
  10  static int sr_probe(struct device *);
  11  static int sr_remove(struct device *);
  12 @@ -693,7 +693,7 @@
  13  static void get_capabilities(struct scsi_cd *cd)
  14  {
  15         unsigned char *buffer;
  16 -       int rc, n, mwr_write = 0, mrw = 1;
  17 +       int rc, n, mrw_write = 0, mrw = 1;
  18         struct scsi_mode_data data;
  19         struct scsi_request *SRpnt;
  20         unsigned char cmd[MAX_COMMAND_SIZE];
  21 @@ -767,13 +767,13 @@
  22                 return;
  23         }
  24
  25 -       if (cdrom_is_mrw(&scsi_CDs[i].cdi, &mrw_write)) {
  26 +       if (cdrom_is_mrw(&cd->cdi, &mrw_write)) {
  27                 mrw = 0;
  28 -               scsi_CDs[i].cdi.mask |= CDC_MRW;
  29 -               scsi_CDs[i].cdi.mask |= CDC_MRW_W;
  30 +               cd->cdi.mask |= CDC_MRW;
  31 +               cd->cdi.mask |= CDC_MRW_W;
  32         }
  33         if (!mrw_write)
  34 -               scsi_CDs[i].cdi.mask |= CDC_MRW_W;
  35 +               cd->cdi.mask |= CDC_MRW_W;
  36
  37         n = data.header_length + data.block_descriptor_length;
  38         cd->cdi.speed = ((buffer[n + 8] << 8) + buffer[n + 9]) / 176;
  39 @@ -825,8 +825,8 @@
  40         /*
  41          * if DVD-RAM of MRW-W, we are randomly writeable
  42          */
  43 -       if ((scsi_CDs[i].cdi.mask & (CDC_DVD_RAM | CDC_MRW_W)) != (CDC_DVD_RAM | CDC_MRW_W))
  44 -               scsi_CDs[i].device->writeable = 1;
  45 +       if ((cd->cdi.mask & (CDC_DVD_RAM | CDC_MRW_W)) != (CDC_DVD_RAM | CDC_MRW_W))
  46 +               cd->device->writeable = 1;
  47
  48         scsi_release_request(SRpnt);
  49         kfree(buffer);