Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186639
b: refs/heads/master
c: 75c8075
h: refs/heads/master
i:
  186637: 2e1c70a
  186635: 5e0240b
  186631: 6c6f7bb
  186623: 664026c
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent f173c7b commit a666c0b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0daa04a586f03de8f9022e29fb41c9dc0de28c4a
refs/heads/master: 75c8075394906b4bda4b056328bd9b401277d9b8
5 changes: 4 additions & 1 deletion trunk/drivers/staging/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,14 @@ EXPORT_SYMBOL(__iio_change_event);
/* Does anyone care? */
mutex_lock(&ev_int->event_list_lock);
if (test_bit(IIO_BUSY_BIT_POS, &ev_int->handler.flags)) {
if (ev_int->current_events == ev_int->max_events)
if (ev_int->current_events == ev_int->max_events) {
mutex_unlock(&ev_int->event_list_lock);
return 0;
}
ev = kmalloc(sizeof(*ev), GFP_KERNEL);
if (ev == NULL) {
ret = -ENOMEM;
mutex_unlock(&ev_int->event_list_lock);
goto error_ret;
}
ev->ev.id = ev_code;
Expand Down

0 comments on commit a666c0b

Please sign in to comment.