diff options
| author | Markus Grabner <grabner@icg.tugraz.at> | 2010-08-23 01:08:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-31 15:28:16 -0700 |
| commit | e1a164d7a3e05aae15eb603ee8f1b77446480a3b (patch) | |
| tree | 829d6ed586e9fe3680be24faab8c61d5c596443e /drivers/staging/line6/dumprequest.c | |
| parent | 1027f476f507ef7ed9919cd3e3d32310f3985da1 (diff) | |
| download | linux-e1a164d7a3e05aae15eb603ee8f1b77446480a3b.tar.gz linux-e1a164d7a3e05aae15eb603ee8f1b77446480a3b.tar.bz2 linux-e1a164d7a3e05aae15eb603ee8f1b77446480a3b.zip | |
Staging: line6: another upstream sync
Everything should be in sync now.
Signed-off-by: Markus Grabner <grabner@icg.tugraz.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/line6/dumprequest.c')
| -rw-r--r-- | drivers/staging/line6/dumprequest.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/line6/dumprequest.c b/drivers/staging/line6/dumprequest.c index 891a6976e995..60c7bae3ad3c 100644 --- a/drivers/staging/line6/dumprequest.c +++ b/drivers/staging/line6/dumprequest.c @@ -1,5 +1,5 @@ /* - * Line6 Linux USB driver - 0.9.0 + * Line6 Linux USB driver - 0.9.1beta * * Copyright (C) 2004-2010 Markus Grabner (grabner@icg.tugraz.at) * @@ -14,7 +14,6 @@ #include "driver.h" #include "dumprequest.h" - /* Set "dump in progress" flag. */ @@ -63,7 +62,8 @@ int line6_dump_request_async(struct line6_dump_request *l6dr, */ int line6_dump_wait_interruptible(struct line6_dump_request *l6dr) { - return wait_event_interruptible(l6dr->wait, l6dr->in_progress == LINE6_DUMP_NONE); + return wait_event_interruptible(l6dr->wait, + l6dr->in_progress == LINE6_DUMP_NONE); } /* @@ -79,7 +79,9 @@ void line6_dump_wait(struct line6_dump_request *l6dr) */ int line6_dump_wait_timeout(struct line6_dump_request *l6dr, long timeout) { - return wait_event_timeout(l6dr->wait, l6dr->in_progress == LINE6_DUMP_NONE, timeout); + return wait_event_timeout(l6dr->wait, + l6dr->in_progress == LINE6_DUMP_NONE, + timeout); } /* |