Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[~andy/linux] / drivers / memstick / host / tifm_ms.c

diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index 6902b83eb1b48a803bff1fe51bfc0741ed8ed2a3..7bafa72f8f5789ccec9cb9975e5f8aac293a0bcc 100644 (file)
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -210,7 +210,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host)
                        p_cnt = min(p_cnt, length);
 
                        local_irq_save(flags);
-                       buf = kmap_atomic(pg, KM_BIO_SRC_IRQ) + p_off;
+                       buf = kmap_atomic(pg) + p_off;
                } else {
                        buf = host->req->data + host->block_pos;
                        p_cnt = host->req->data_len - host->block_pos;
@@ -221,7 +221,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host)
                         : tifm_ms_read_data(host, buf, p_cnt);
 
                if (host->req->long_data) {
-                       kunmap_atomic(buf - p_off, KM_BIO_SRC_IRQ);
+                       kunmap_atomic(buf - p_off);
                        local_irq_restore(flags);
                }