diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /net/bluetooth/af_bluetooth.c | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
| -rw-r--r-- | net/bluetooth/af_bluetooth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 788ea7a2b744..305a099b7477 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c | |||
| @@ -276,7 +276,7 @@ int bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo) | |||
| 276 | set_current_state(TASK_INTERRUPTIBLE); | 276 | set_current_state(TASK_INTERRUPTIBLE); |
| 277 | 277 | ||
| 278 | if (!timeo) { | 278 | if (!timeo) { |
| 279 | err = -EAGAIN; | 279 | err = -EINPROGRESS; |
| 280 | break; | 280 | break; |
| 281 | } | 281 | } |
| 282 | 282 | ||