1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 0e298dba9fc..29b8ab44ea4 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -360,8 +360,8 @@ int PSSendOps(void *arg)
                 status = 1;
                 goto complete;
         }
-        len = (firmware->size > MAX_BDADDR_FORMAT_LENGTH)? MAX_BDADDR_FORMAT_LENGTH: firmware->size;
-        memcpy(config_bdaddr, firmware->data,len);
+        len = min(firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1);
+        memcpy(config_bdaddr, firmware->data, len);
         config_bdaddr[len] = '\0';
         write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING);
         A_RELEASE_FIRMWARE(firmware);