diff options
| author | Christophe JAILLET | 2021-07-14 13:14:51 +0200 |
|---|---|---|
| committer | Jonathan Cameron | 2021-07-17 17:57:46 +0100 |
| commit | d21fed0675cd190bf35b9c2e3031c6064531734b (patch) | |
| tree | 40f6381b9470ca804dcf4ccd5c17b1eb4e8113a4 /drivers/iio/industrialio-buffer.c | |
| parent | 458516508df977efd3ff043d5ff77cad2d8f9d64 (diff) | |
iio: buffer: Move a sanity check at the beginning of 'iio_scan_mask_set()'
This is more standard to have sanity checks at the entry of a function,
instead of allocating some memory first and having to free it if a
condition is not met.
Shuffle code a bit to check 'masklength' before calling 'bitmap_alloc()'
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/98a351adda1908c306e981b9cc86d3dbc79eb5ec.1626261211.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio/industrialio-buffer.c')
| -rw-r--r-- | drivers/iio/industrialio-buffer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 6d4776a7f002..a95cc2da56be 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -354,13 +354,14 @@ static int iio_scan_mask_set(struct iio_dev *indio_dev, const unsigned long *mask; unsigned long *trialmask; - trialmask = bitmap_alloc(indio_dev->masklength, GFP_KERNEL); - if (!trialmask) - return -ENOMEM; if (!indio_dev->masklength) { WARN(1, "Trying to set scanmask prior to registering buffer\n"); - goto err_invalid_mask; + return -EINVAL; } + + trialmask = bitmap_alloc(indio_dev->masklength, GFP_KERNEL); + if (!trialmask) + return -ENOMEM; bitmap_copy(trialmask, buffer->scan_mask, indio_dev->masklength); set_bit(bit, trialmask); |