From 337f7e64b4f54b1f98a820bc4b935fc3ac28d45d Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 10 Mar 2011 18:55:28 -0800 Subject: [PATCH] --- yaml --- r: 236372 b: refs/heads/master c: 7702c36072072427db2166cc6e68bfc52b4209bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8f63968fa5cb..8b1eeb56d9b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e49c459c33189cfc7cff581d3c2e7f0074835118 +refs/heads/master: 7702c36072072427db2166cc6e68bfc52b4209bb diff --git a/trunk/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c b/trunk/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c index 67e6d5edfa51..55b0633af9ee 100644 --- a/trunk/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c +++ b/trunk/drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c @@ -360,7 +360,7 @@ int PSSendOps(void *arg) status = 1; goto complete; } - len = min(firmware->size, MAX_BDADDR_FORMAT_LENGTH - 1); + len = min_t(size_t, 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);