Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (200 commits)
  [SCSI] usbstorage: use last_sector_bug flag universally
  [SCSI] libsas: abstract STP task status into a function
  [SCSI] ultrastor: clean up inline asm warnings
  [SCSI] aic7xxx: fix firmware build
  [SCSI] aacraid: fib context lock for management ioctls
  [SCSI] ch: remove forward declarations
  [SCSI] ch: fix device minor number management bug
  [SCSI] ch: handle class_device_create failure properly
  [SCSI] NCR5380: fix section mismatch
  [SCSI] sg: fix /proc/scsi/sg/devices when no SCSI devices
  [SCSI] IB/iSER: add logical unit reset support
  [SCSI] don't use __GFP_DMA for sense buffers if not required
  [SCSI] use dynamically allocated sense buffer
  [SCSI] scsi.h: add macro for enclosure bit of inquiry data
  [SCSI] sd: add fix for devices with last sector access problems
  [SCSI] fix pcmcia compile problem
  [SCSI] aacraid: add Voodoo Lite class of cards.
  [SCSI] aacraid: add new driver features flags
  [SCSI] qla2xxx: Update version number to 8.02.00-k7.
  [SCSI] qla2xxx: Issue correct MBC_INITIALIZE_FIRMWARE command.
  ...

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c
index 03cd44f231df..b4304ae78527 100644
--- a/drivers/scsi/wd7000.c
+++ b/drivers/scsi/wd7000.c
@@ -1108,13 +1108,10 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,
         scb->host = host;
 
         nseg = scsi_sg_count(SCpnt);
-        if (nseg) {
+        if (nseg > 1) {
                 struct scatterlist *sg;
                 unsigned i;
 
-                if (SCpnt->device->host->sg_tablesize == SG_NONE) {
-                        panic("wd7000_queuecommand: scatter/gather not supported.\n");
-                }
                 dprintk("Using scatter/gather with %d elements.\n", nseg);
 
                 sgb = scb->sgb;
@@ -1128,7 +1125,10 @@ static int wd7000_queuecommand(struct scsi_cmnd *SCpnt,
                 }
         } else {
                 scb->op = 0;
-                any2scsi(scb->dataptr, isa_virt_to_bus(scsi_sglist(SCpnt)));
+                if (nseg) {
+                        struct scatterlist *sg = scsi_sglist(SCpnt);
+                        any2scsi(scb->dataptr, isa_page_to_bus(sg_page(sg)) + sg->offset);
+                }
                 any2scsi(scb->maxlen, scsi_bufflen(SCpnt));
         }
 
@@ -1524,7 +1524,7 @@ static __init int wd7000_detect(struct scsi_host_template *tpnt)
                                  *  For boards before rev 6.0, scatter/gather isn't supported.
                                  */
                                 if (host->rev1 < 6)
-                                        sh->sg_tablesize = SG_NONE;
+                                        sh->sg_tablesize = 1;
 
                                 present++;      /* count it */