From 9bd2e7abb4b93e167f83c41cbeff26b411bc9707 Mon Sep 17 00:00:00 2001
From: Markus Grabner <grabner@icg.tugraz.at>
Date: Fri, 17 Sep 2010 23:33:25 +0200
Subject: [PATCH] --- yaml --- r: 219914 b: refs/heads/master c:
 c7fcf25525b3cd6559f882837bfa76d04a80f8a6 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/line6/capture.c  | 3 +++
 trunk/drivers/staging/line6/revision.h | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e45a14f34f99..bf18ad805f69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 340362abb9544043d41e047c63d86dffe990a48c
+refs/heads/master: c7fcf25525b3cd6559f882837bfa76d04a80f8a6
diff --git a/trunk/drivers/staging/line6/capture.c b/trunk/drivers/staging/line6/capture.c
index a3c99244b359..06a6db889fbd 100644
--- a/trunk/drivers/staging/line6/capture.c
+++ b/trunk/drivers/staging/line6/capture.c
@@ -147,6 +147,9 @@ void line6_capture_copy(struct snd_line6_pcm *line6pcm, char *fbuf, int fsize)
 	const int bytes_per_frame = line6pcm->properties->bytes_per_frame;
 	int frames = fsize / bytes_per_frame;
 
+	if (runtime == 0)
+		return;
+
 	if (line6pcm->pos_in_done + frames > runtime->buffer_size) {
 		/*
 		   The transferred area goes over buffer boundary,
diff --git a/trunk/drivers/staging/line6/revision.h b/trunk/drivers/staging/line6/revision.h
index e9883f6d2ecc..350d0dfff8f8 100644
--- a/trunk/drivers/staging/line6/revision.h
+++ b/trunk/drivers/staging/line6/revision.h
@@ -1,4 +1,4 @@
 #ifndef DRIVER_REVISION
 /* current subversion revision */
-#define DRIVER_REVISION " (revision 684)"
+#define DRIVER_REVISION " (revision 690)"
 #endif