---

yaml --- r: 120332 b: refs/heads/master c: 472346d h: refs/heads/master v: v3
git-mirror · Dec 22, 2008 · edb7e87 · edb7e87
1 parent 6478ea5
commit edb7e87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c69134858722977a82f58cae88e7ffdb28e1e858
+refs/heads/master: 472346da9cc4231bec03ff2032e0d5fd4037232c
diff --git a/trunk/sound/soc/omap/omap-pcm.c b/trunk/sound/soc/omap/omap-pcm.c
@@ -97,7 +97,7 @@ static int omap_pcm_hw_params(struct snd_pcm_substream *substream,
 	prtd->dma_data = dma_data;
 	err = omap_request_dma(dma_data->dma_req, dma_data->name,
 			       omap_pcm_dma_irq, substream, &prtd->dma_ch);
-	if (!err & !cpu_is_omap1510()) {
+	if (!err && !cpu_is_omap1510()) {
 		/*
 		 * Link channel with itself so DMA doesn't need any
 		 * reprogramming while looping the buffer