git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-alsa.c
diff --git
a/drivers/media/video/cx88/cx88-alsa.c
b/drivers/media/video/cx88/cx88-alsa.c
index
40ffd7a
..
8735227
100644
(file)
--- a/
drivers/media/video/cx88/cx88-alsa.c
+++ b/
drivers/media/video/cx88/cx88-alsa.c
@@
-417,7
+417,7
@@
static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP|RISC_IRQ1|RISC_CNT_INC);
buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
- buf->vb.state =
STATE
_PREPARED;
+ buf->vb.state =
VIDEOBUF
_PREPARED;
chip->buf = buf;
chip->dma_risc = dma;