projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge staging-next tree into Linus's latest version
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
iio
/
accel
/
lis3l02dq_ring.c
diff --git
a/drivers/staging/iio/accel/lis3l02dq_ring.c
b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 78d8572e632301aeb90d370dc0cd256225c8f029..e4e202e6cb3a94bd84d4ea471cbb2762918c8443 100644
(file)
--- a/
drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/
drivers/staging/iio/accel/lis3l02dq_ring.c
@@
-492,6
+492,9
@@
int lis3l02dq_probe_trigger(struct iio_dev *indio_dev)
struct lis3l02dq_state *state = indio_dev->dev_data;
state->trig = iio_allocate_trigger();
+ if (!state->trig)
+ return -ENOMEM;
+
state->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
if (!state->trig->name) {
ret = -ENOMEM;