diff options
| author | Mark Brown | 2015-09-16 21:44:25 +0200 |
|---|---|---|
| committer | Mark Brown | 2015-09-16 21:44:25 +0200 |
| commit | 92243b6fc8fcb16bf401b055f7a0ba79f70a4115 (patch) | |
| tree | 08e9fa205efb9bfab23b6ea59fc0a3eaa3fed82b /drivers/input/ff-core.c | |
| parent | spi: Fix documentation of spi_alloc_master() (diff) | |
| parent | Linux 4.3-rc1 (diff) | |
| download | kernel-qcow2-linux-92243b6fc8fcb16bf401b055f7a0ba79f70a4115.tar.gz kernel-qcow2-linux-92243b6fc8fcb16bf401b055f7a0ba79f70a4115.tar.xz kernel-qcow2-linux-92243b6fc8fcb16bf401b055f7a0ba79f70a4115.zip | |
Merge tag 'v4.3-rc1' into spi-fix-doc
Linux 4.3-rc1
Diffstat (limited to 'drivers/input/ff-core.c')
| -rw-r--r-- | drivers/input/ff-core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c index 8f4a30fccbb6..c64208267198 100644 --- a/drivers/input/ff-core.c +++ b/drivers/input/ff-core.c @@ -343,9 +343,8 @@ int input_ff_create(struct input_dev *dev, unsigned int max_effects) __set_bit(EV_FF, dev->evbit); /* Copy "true" bits into ff device bitmap */ - for (i = 0; i <= FF_MAX; i++) - if (test_bit(i, dev->ffbit)) - __set_bit(i, ff->ffbit); + for_each_set_bit(i, dev->ffbit, FF_CNT) + __set_bit(i, ff->ffbit); /* we can emulate RUMBLE with periodic effects */ if (test_bit(FF_PERIODIC, ff->ffbit)) |