Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 287672
b: refs/heads/master
c: 64f8c13
h: refs/heads/master
v: v3
  • Loading branch information
majianpeng authored and Benjamin Herrenschmidt committed Feb 16, 2012
1 parent 1b548ec commit c005fb3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 54321242afe6fcf8b7e589bc21ecf832bc5a206a
refs/heads/master: 64f8c13561fbd2f1a8b4a8975b2aee73b561093e
4 changes: 2 additions & 2 deletions trunk/drivers/macintosh/adb.c
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
req = NULL;
spin_lock_irqsave(&state->lock, flags);
add_wait_queue(&state->wait_queue, &wait);
current->state = TASK_INTERRUPTIBLE;
set_current_state(TASK_INTERRUPTIBLE);

for (;;) {
req = state->completed;
Expand All @@ -734,7 +734,7 @@ static ssize_t adb_read(struct file *file, char __user *buf,
spin_lock_irqsave(&state->lock, flags);
}

current->state = TASK_RUNNING;
set_current_state(TASK_RUNNING);
remove_wait_queue(&state->wait_queue, &wait);
spin_unlock_irqrestore(&state->lock, flags);

Expand Down

0 comments on commit c005fb3

Please sign in to comment.