Commit 975ec51b authored by Russell King's avatar Russell King

[ARM] No point having "nonblock" local variable - kill it.

parent aa97cacb
...@@ -205,12 +205,12 @@ static ssize_t apm_read(struct file *fp, char __user *buf, size_t count, loff_t ...@@ -205,12 +205,12 @@ static ssize_t apm_read(struct file *fp, char __user *buf, size_t count, loff_t
{ {
struct apm_user *as = fp->private_data; struct apm_user *as = fp->private_data;
apm_event_t event; apm_event_t event;
int i = count, ret = 0, nonblock = fp->f_flags & O_NONBLOCK; int i = count, ret = 0;
if (count < sizeof(apm_event_t)) if (count < sizeof(apm_event_t))
return -EINVAL; return -EINVAL;
if (queue_empty(&as->queue) && nonblock) if (queue_empty(&as->queue) && fp->f_flags & O_NONBLOCK)
return -EAGAIN; return -EAGAIN;
wait_event_interruptible(apm_waitqueue, !queue_empty(&as->queue)); wait_event_interruptible(apm_waitqueue, !queue_empty(&as->queue));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment