---

yaml --- r: 285258 b: refs/heads/master c: 64dcb19 h: refs/heads/master v: v3
git-mirror · Nov 24, 2011 · 8805bc5 · 8805bc5
1 parent 6deae75
commit 8805bc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81f4c8dddc804c4ecd0fdcf903d545053ef2857f
+refs/heads/master: 64dcb194969d8d4447911e69f8b633ff2b87be40
diff --git a/trunk/drivers/media/video/cx25821/cx25821-audio-upstream.c b/trunk/drivers/media/video/cx25821/cx25821-audio-upstream.c
@@ -398,9 +398,9 @@ int cx25821_openfile_audio(struct cx25821_dev *dev,
 				vfs_read_retval =
 				    vfs_read(myfile, mybuf, line_size, &pos);
 
-				if (vfs_read_retval > 0
-				    && vfs_read_retval == line_size
-				    && dev->_audiodata_buf_virt_addr != NULL) {
+				if (vfs_read_retval > 0 &&
+				    vfs_read_retval == line_size &&
+				    dev->_audiodata_buf_virt_addr != NULL) {
 					memcpy((void *)(dev->
 							_audiodata_buf_virt_addr
 							+ offset / 4), mybuf,