3 files changed, 4 insertions, 3 deletions

diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c
index 55bd69e913b9..0018cdbd0156 100644
--- a/drivers/net/wimax/i2400m/fw.c
+++ b/drivers/net/wimax/i2400m/fw.c
@@ -343,7 +343,6 @@ ssize_t i2400m_bm_cmd(struct i2400m *i2400m,
         BUG_ON(i2400m->boot_mode == 0);
 
         if (cmd != NULL) {              /* send the command */
-                memcpy(i2400m->bm_cmd_buf, cmd, cmd_size);
                 result = i2400m->bus_bm_cmd_send(i2400m, cmd, cmd_size, flags);
                 if (result < 0)
                         goto error_cmd_send;
diff --git a/drivers/net/wimax/i2400m/sdio-fw.c b/drivers/net/wimax/i2400m/sdio-fw.c
index c8dc538d40c1..8e025418f5be 100644
--- a/drivers/net/wimax/i2400m/sdio-fw.c
+++ b/drivers/net/wimax/i2400m/sdio-fw.c
@@ -118,7 +118,8 @@ ssize_t i2400ms_bus_bm_cmd_send(struct i2400m *i2400m,
         if (cmd_size > I2400M_BM_CMD_BUF_SIZE)
                 goto error_too_big;
 
-        memcpy(i2400m->bm_cmd_buf, _cmd, cmd_size);     /* Prep command */
+        if (_cmd != i2400m->bm_cmd_buf)
+                memmove(i2400m->bm_cmd_buf, _cmd, cmd_size);
         cmd = i2400m->bm_cmd_buf;
         if (cmd_size_a > cmd_size)                      /* Zero pad space */
                 memset(i2400m->bm_cmd_buf + cmd_size, 0, cmd_size_a - cmd_size);
diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c
index a2250e49a444..f162c815d505 100644
--- a/drivers/net/wimax/i2400m/usb-fw.c
+++ b/drivers/net/wimax/i2400m/usb-fw.c
@@ -172,7 +172,8 @@ ssize_t i2400mu_bus_bm_cmd_send(struct i2400m *i2400m,
         result = -E2BIG;
         if (cmd_size > I2400M_BM_CMD_BUF_SIZE)
                 goto error_too_big;
-        memcpy(i2400m->bm_cmd_buf, _cmd, cmd_size);
+        if (_cmd != i2400m->bm_cmd_buf)
+                memmove(i2400m->bm_cmd_buf, _cmd, cmd_size);
         cmd = i2400m->bm_cmd_buf;
         if (cmd_size_a > cmd_size)                      /* Zero pad space */
                 memset(i2400m->bm_cmd_buf + cmd_size, 0, cmd_size_a - cmd_size);