Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92253
b: refs/heads/master
c: b32432e
h: refs/heads/master
i:
  92251: 484b7cb
v: v3
  • Loading branch information
Mark Brown authored and Takashi Iwai committed Apr 24, 2008
1 parent 2c2f295 commit 778deac
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 22cd630285b6a12a50f02dfb23c531f151be5499
refs/heads/master: b32432e3f2d386d9563669c8cfdeaa473bfd8572
9 changes: 4 additions & 5 deletions trunk/sound/soc/pxa/pxa2xx-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ static void pxa2xx_pcm_dma_irq(int dma_ch, void *dev_id)
if (dcsr & DCSR_ENDINTR) {
snd_pcm_period_elapsed(substream);
} else {
printk( KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n",
prtd->params->name, dma_ch, dcsr );
printk(KERN_ERR "%s: DMA error on channel %d (DCSR=%#x)\n",
prtd->params->name, dma_ch, dcsr);
}
}

Expand All @@ -84,8 +84,8 @@ static int pxa2xx_pcm_hw_params(struct snd_pcm_substream *substream,

/* return if this is a bufferless transfer e.g.
* codec <--> BT codec or GSM modem -- lg FIXME */
if (!dma)
return 0;
if (!dma)
return 0;

/* this may get called several times by oss emulation
* with different params */
Expand Down Expand Up @@ -363,7 +363,6 @@ struct snd_soc_platform pxa2xx_soc_platform = {
.pcm_new = pxa2xx_pcm_new,
.pcm_free = pxa2xx_pcm_free_dma_buffers,
};

EXPORT_SYMBOL_GPL(pxa2xx_soc_platform);

MODULE_AUTHOR("Nicolas Pitre");
Expand Down

0 comments on commit 778deac

Please sign in to comment.