4 files changed, 34 insertions, 56 deletions

diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 26964895c88b..74e2aa23b045 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -30,7 +30,6 @@
 
 #include <linux/kernel.h>
 #include <linux/input.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/usb/input.h>
diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index 5dfb4c36a1b0..12e3c2fac642 100644
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -135,69 +135,42 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,
         unsigned int buflen, struct scsi_cmnd *srb, struct scatterlist **sgptr,
         unsigned int *offset, enum xfer_buf_dir dir)
 {
-        unsigned int cnt;
+        unsigned int cnt = 0;
         struct scatterlist *sg = *sgptr;
+        struct sg_mapping_iter miter;
+        unsigned int nents = scsi_sg_count(srb);
 
-        /* We have to go through the list one entry
-         * at a time.  Each s-g entry contains some number of pages, and
-         * each page has to be kmap()'ed separately.  If the page is already
-         * in kernel-addressable memory then kmap() will return its address.
-         * If the page is not directly accessible -- such as a user buffer
-         * located in high memory -- then kmap() will map it to a temporary
-         * position in the kernel's virtual address space.
-         */
-
-        if (!sg)
+        if (sg)
+                nents = sg_nents(sg);
+        else
                 sg = scsi_sglist(srb);
 
-        /* This loop handles a single s-g list entry, which may
-         * include multiple pages.  Find the initial page structure
-         * and the starting offset within the page, and update
-         * the *offset and **sgptr values for the next loop.
-         */
-        cnt = 0;
-        while (cnt < buflen && sg) {
-                struct page *page = sg_page(sg) +
-                                ((sg->offset + *offset) >> PAGE_SHIFT);
-                unsigned int poff = (sg->offset + *offset) & (PAGE_SIZE-1);
-                unsigned int sglen = sg->length - *offset;
-
-                if (sglen > buflen - cnt) {
-
-                        /* Transfer ends within this s-g entry */
-                        sglen = buflen - cnt;
-                        *offset += sglen;
-                } else {
+        sg_miter_start(&miter, sg, nents, dir == FROM_XFER_BUF ?
+                SG_MITER_FROM_SG: SG_MITER_TO_SG);
 
-                        /* Transfer continues to next s-g entry */
-                        *offset = 0;
-                        sg = sg_next(sg);
-                }
+        if (!sg_miter_skip(&miter, *offset))
+                return cnt;
+
+        while (sg_miter_next(&miter) && cnt < buflen) {
+                unsigned int len = min_t(unsigned int, miter.length,
+                                buflen - cnt);
+
+                if (dir == FROM_XFER_BUF)
+                        memcpy(buffer + cnt, miter.addr, len);
+                else
+                        memcpy(miter.addr, buffer + cnt, len);
 
-                /* Transfer the data for all the pages in this
-                        * s-g entry.  For each page: call kmap(), do the
-                        * transfer, and call kunmap() immediately after. */
-                while (sglen > 0) {
-                        unsigned int plen = min(sglen, (unsigned int)
-                                        PAGE_SIZE - poff);
-                        unsigned char *ptr = kmap(page);
-
-                        if (dir == TO_XFER_BUF)
-                                memcpy(ptr + poff, buffer + cnt, plen);
-                        else
-                                memcpy(buffer + cnt, ptr + poff, plen);
-                        kunmap(page);
-
-                        /* Start at the beginning of the next page */
-                        poff = 0;
-                        ++page;
-                        cnt += plen;
-                        sglen -= plen;
+                if (*offset + len < miter.piter.sg->length) {
+                        *offset += len;
+                        *sgptr = miter.piter.sg;
+                } else {
+                        *offset = 0;
+                        *sgptr = sg_next(miter.piter.sg);
                 }
+                cnt += len;
         }
-        *sgptr = sg;
+        sg_miter_stop(&miter);
 
-        /* Return the amount actually transferred */
         return cnt;
 }
 EXPORT_SYMBOL_GPL(usb_stor_access_xfer_buf);
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index de32cfa5bfa6..ad06255c2ade 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -234,6 +234,13 @@ UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x0370,
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 US_FL_MAX_SECTORS_64 ),
 
+/* Patch submitted by Mikhail Zolotaryov <lebon@lebon.org.ua> */
+UNUSUAL_DEV(  0x0421, 0x06aa, 0x1110, 0x1110,
+                "Nokia",
+                "502",
+                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64 ),
+
 #ifdef NO_SDDR09
 UNUSUAL_DEV(  0x0436, 0x0005, 0x0100, 0x0100,
                 "Microtech",
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index 5c4fe0749af1..1c0b89f2a138 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -53,7 +53,6 @@
 #include <linux/errno.h>
 #include <linux/freezer.h>
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>