diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:36 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:36 +0200 |
| commit | bb14f8e91a4d2bdb8643f6f166299ada8d015377 (patch) | |
| tree | f212dc9be4f26684bd06bfd138444282b457949a /drivers | |
| parent | 180bbb1528515d262ae4bcb7244379b8dcfc9674 (diff) | |
| parent | 025ddfad021effc8ea256d8aa09ddf3b1b8972e6 (diff) | |
Merge topic branch 'other' into integration-linux-ux500-3.3
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/android/logger.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index ffc2d043dd8..a45c3b04fc5 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -432,7 +432,12 @@ static int logger_release(struct inode *ignored, struct file *file) { if (file->f_mode & FMODE_READ) { struct logger_reader *reader = file->private_data; + struct logger_log *log = reader->log; + + mutex_lock(&log->mutex); list_del(&reader->list); + mutex_unlock(&log->mutex); + kfree(reader); } |