diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-04-17 03:48:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-13 13:25:28 -0300 |
| commit | e72936d2350a925b448be66b20da940c2c8f99ca (patch) | |
| tree | 96de00453b439168d417d2febe31ab2fd9410543 /drivers/media/pci/saa7134/saa7134-alsa.c | |
| parent | 17e7f1b515803e1a79b246688aacbddd2e34165d (diff) | |
[media] saa7134: coding style cleanups
Just white space and coding style changes to reduce the noise in the
following patches.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134/saa7134-alsa.c')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-alsa.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c index e04a4d5d6672..ff6f3735f998 100644 --- a/drivers/media/pci/saa7134/saa7134-alsa.c +++ b/drivers/media/pci/saa7134/saa7134-alsa.c @@ -648,19 +648,20 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream, return err; } - if (0 != (err = videobuf_dma_map(&dev->pci->dev, &dev->dmasound.dma))) { + err = videobuf_dma_map(&dev->pci->dev, &dev->dmasound.dma); + if (err) { dsp_buffer_free(dev); return err; } - if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt))) { + err = saa7134_pgtable_alloc(dev->pci, &dev->dmasound.pt); + if (err) { videobuf_dma_unmap(&dev->pci->dev, &dev->dmasound.dma); dsp_buffer_free(dev); return err; } - if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->dmasound.pt, - dev->dmasound.dma.sglist, - dev->dmasound.dma.sglen, - 0))) { + err = saa7134_pgtable_build(dev->pci, &dev->dmasound.pt, + dev->dmasound.sglist, dev->dmasound.sglen, 0); + if (err) { saa7134_pgtable_free(dev->pci, &dev->dmasound.pt); videobuf_dma_unmap(&dev->pci->dev, &dev->dmasound.dma); dsp_buffer_free(dev); |