diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 08:24:07 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 08:24:07 +0200 |
| commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
| tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /drivers/net/wireless/b43legacy/sysfs.c | |
| parent | Input: synaptics - fix resolution for manually provided min/max (diff) | |
| parent | Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version (diff) | |
| download | linux-a292241cccb7e20e8b997a9a44177e7c98141859.tar.xz linux-a292241cccb7e20e8b997a9a44177e7c98141859.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'drivers/net/wireless/b43legacy/sysfs.c')
| -rw-r--r-- | drivers/net/wireless/b43legacy/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43legacy/sysfs.c b/drivers/net/wireless/b43legacy/sysfs.c index 57f8b089767c..2a1da15c913b 100644 --- a/drivers/net/wireless/b43legacy/sysfs.c +++ b/drivers/net/wireless/b43legacy/sysfs.c @@ -42,7 +42,7 @@ static int get_integer(const char *buf, size_t count) if (count == 0) goto out; - count = min(count, (size_t)10); + count = min_t(size_t, count, 10); memcpy(tmp, buf, count); ret = simple_strtol(tmp, NULL, 10); out: |