aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJavier Martinez Canillas <martinez.javier@gmail.com>2011-03-10 21:55:28 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-11 17:31:46 -0500
commit7702c36072072427db2166cc6e68bfc52b4209bb (patch)
tree50b585c5e21d8adbe338ac2220136ae48a6e2eba
parente49c459c33189cfc7cff581d3c2e7f0074835118 (diff)
staging: ath6kl: Cast variable to size_t to avoid compile warning
The min() macro does strict type-checking so use min_t() instead to silence a compile warning. Cc: Naveen Singh <naveen.singh@atheros.com> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
index 67e6d5edfa5..55b0633af9e 100644
--- a/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
+++ b/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c
@@ -360,7 +360,7 @@ int PSSendOps(void *arg)
360 status = 1; 360 status = 1;
361 goto complete; 361 goto complete;
362 } 362 }
363 len = min(firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1); 363 len = min_t(size_t, firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1);
364 memcpy(config_bdaddr, firmware->data, len); 364 memcpy(config_bdaddr, firmware->data, len);
365 config_bdaddr[len] = '\0'; 365 config_bdaddr[len] = '\0';
366 write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING); 366 write_bdaddr(hdev,config_bdaddr,BDADDR_TYPE_STRING);