From 2ab8212e692687702cd651027568682631473033 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 23 Dec 2009 19:54:54 +1100 Subject: [PATCH] --- yaml --- r: 186605 b: refs/heads/master c: cf137d5c49379c5f05fba40baf1535b611410ec0 h: refs/heads/master i: 186603: b4c249fee120c341168dea58a0be11de097097b6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c | 2 +- trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4bc421d6367d..580d7e970dbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27b93f80e47a49a0584a4c8fb58bc44f9e026256 +refs/heads/master: cf137d5c49379c5f05fba40baf1535b611410ec0 diff --git a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c index e8c67d5dfb76..c024fa600729 100644 --- a/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c +++ b/trunk/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c @@ -262,7 +262,7 @@ static int store_debug_level(struct file *file, const char *buffer, unsigned long count, void *data) { char buf[] = "0x00000000"; - unsigned long len = min(sizeof(buf) - 1, count); + unsigned long len = min_t(unsigned long, sizeof(buf) - 1, count); char *p = (char *)buf; unsigned long val; diff --git a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c index 7a8690f449b4..b752017a4d18 100644 --- a/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c +++ b/trunk/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c @@ -260,7 +260,7 @@ static int store_debug_level(struct file *file, const char *buffer, unsigned long count, void *data) { char buf[] = "0x00000000"; - unsigned long len = min(sizeof(buf) - 1, count); + unsigned long len = min_t(unsigned long, sizeof(buf) - 1, count); char *p = (char *)buf; unsigned long val;