diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-02 16:46:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-02 16:46:03 +1100 |
| commit | d3ce2e62316fdb9bcdb3528974c4bd6662a1f0ae (patch) | |
| tree | adfa1964330a02c67235de20968ef00c3b0a7921 /drivers/staging/rtl8192su/ieee80211/ieee80211_module.c | |
| parent | 751e18e50cfe48c6506b7cce97cfd9be883b2033 (diff) | |
| parent | 2de7b802493f37d708ed7447b222e196ea8882a4 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/rtl8192su/ieee80211/ieee80211_module.c')
| -rw-r--r-- | drivers/staging/rtl8192su/ieee80211/ieee80211_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c index e8c67d5dfb76..c024fa600729 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_module.c +++ b/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; |