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

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block: (63 commits)
  Fix memory leak in dm-crypt
  SPARC64: sg chaining support
  SPARC: sg chaining support
  PPC: sg chaining support
  PS3: sg chaining support
  IA64: sg chaining support
  x86-64: enable sg chaining
  x86-64: update pci-gart iommu to sg helpers
  x86-64: update nommu to sg helpers
  x86-64: update calgary iommu to sg helpers
  swiotlb: sg chaining support
  i386: enable sg chaining
  i386 dma_map_sg: convert to using sg helpers
  mmc: need to zero sglist on init
  Panic in blk_rq_map_sg() from CCISS driver
  remove sglist_len
  remove blk_queue_max_phys_segments in libata
  revert sg segment size ifdefs
  Fixup u14-34f ENABLE_SG_CHAINING
  qla1280: enable use_sg_chaining option
  ...

1 files changed, 10 insertions, 6 deletions

diff --git a/drivers/usb/storage/sddr55.c b/drivers/usb/storage/sddr55.c
index 0b1b5b59ca7b..d43a3415e12f 100644
--- a/drivers/usb/storage/sddr55.c
+++ b/drivers/usb/storage/sddr55.c
@@ -167,7 +167,8 @@ static int sddr55_read_data(struct us_data *us,
         unsigned long address;
 
         unsigned short pages;
-        unsigned int len, index, offset;
+        unsigned int len, offset;
+        struct scatterlist *sg;
 
         // Since we only read in one block at a time, we have to create
         // a bounce buffer and move the data a piece at a time between the
@@ -178,7 +179,8 @@ static int sddr55_read_data(struct us_data *us,
         buffer = kmalloc(len, GFP_NOIO);
         if (buffer == NULL)
                 return USB_STOR_TRANSPORT_ERROR; /* out of memory */
-        index = offset = 0;
+        offset = 0;
+        sg = NULL;
 
         while (sectors>0) {
 
@@ -255,7 +257,7 @@ static int sddr55_read_data(struct us_data *us,
 
                 // Store the data in the transfer buffer
                 usb_stor_access_xfer_buf(buffer, len, us->srb,
-                                &index, &offset, TO_XFER_BUF);
+                                &sg, &offset, TO_XFER_BUF);
 
                 page = 0;
                 lba++;
@@ -287,7 +289,8 @@ static int sddr55_write_data(struct us_data *us,
 
         unsigned short pages;
         int i;
-        unsigned int len, index, offset;
+        unsigned int len, offset;
+        struct scatterlist *sg;
 
         /* check if we are allowed to write */
         if (info->read_only || info->force_read_only) {
@@ -304,7 +307,8 @@ static int sddr55_write_data(struct us_data *us,
         buffer = kmalloc(len, GFP_NOIO);
         if (buffer == NULL)
                 return USB_STOR_TRANSPORT_ERROR;
-        index = offset = 0;
+        offset = 0;
+        sg = NULL;
 
         while (sectors > 0) {
 
@@ -322,7 +326,7 @@ static int sddr55_write_data(struct us_data *us,
 
                 // Get the data from the transfer buffer
                 usb_stor_access_xfer_buf(buffer, len, us->srb,
-                                &index, &offset, FROM_XFER_BUF);
+                                &sg, &offset, FROM_XFER_BUF);
 
                 US_DEBUGP("Write %02X pages, to PBA %04X"
                         " (LBA %04X) page %02X\n",