Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drivers/mailbox/mailbox-test.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,13 @@ static ssize_t mbox_test_message_read(struct file *filp, char __user *userbuf,

if (filp->f_flags & O_NONBLOCK) {
ret = -EAGAIN;
__set_current_state(TASK_RUNNING);
goto waitq_err;
}

if (signal_pending(current)) {
ret = -ERESTARTSYS;
__set_current_state(TASK_RUNNING);
goto waitq_err;
}
schedule();
Expand All @@ -231,9 +233,9 @@ static ssize_t mbox_test_message_read(struct file *filp, char __user *userbuf,

spin_unlock_irqrestore(&tdev->lock, flags);

__set_current_state(TASK_RUNNING);
ret = simple_read_from_buffer(userbuf, count, ppos, touser, MBOX_HEXDUMP_MAX_LEN);
waitq_err:
__set_current_state(TASK_RUNNING);
remove_wait_queue(&tdev->waitq, &wait);
kfree_err:
kfree(touser);
Expand Down