4 files changed, 11 insertions, 11 deletions

diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index e9ffe8f144ac..e7c3691fc500 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -277,7 +277,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev)
                 BUG();
         videobuf_dma_init(&dev->oss.dma);
         err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE,
-                                       (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
+                                       (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT);
         if (0 != err)
                 return err;
         return 0;
@@ -336,9 +336,9 @@ static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream)
         if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt)))
                 goto fail1;
         if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt,
-                                              dev->oss.dma.sglist,
-                                              dev->oss.dma.sglen,
-                                              0)))
+                                              dev->oss.dma.sglist,
+                                              dev->oss.dma.sglen,
+                                              0)))
                 goto fail2;
 
 
@@ -481,8 +481,8 @@ static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t *
 static snd_pcm_hardware_t snd_card_saa7134_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID),
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
         .formats =              USE_FORMATS,
         .rates =                USE_RATE,
         .rate_min =             USE_RATE_MIN,
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 5aadd44c2fa2..342891d431a8 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -547,7 +547,7 @@ static int philips_tda827x_pll_set(struct dvb_frontend *fe, struct dvb_frontend_
         u8 tuner_buf[14];
 
         struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tuner_buf,
-                                        .len = sizeof(tuner_buf) };
+                                        .len = sizeof(tuner_buf) };
         int i, tuner_freq, if_freq;
         u32 N;
         switch (params->u.ofdm.bandwidth) {
@@ -606,7 +606,7 @@ static void philips_tda827x_pll_sleep(struct dvb_frontend *fe)
         struct saa7134_dev *dev = fe->dvb->priv;
         static u8 tda827x_sleep[] = { 0x30, 0xd0};
         struct i2c_msg tuner_msg = {.addr = 0x60,.flags = 0,.buf = tda827x_sleep,
-                                    .len = sizeof(tda827x_sleep) };
+                                    .len = sizeof(tda827x_sleep) };
         i2c_transfer(&dev->i2c_adap, &tuner_msg, 1);
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 7ce0459989b5..f99dbb729555 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -118,7 +118,7 @@ static IR_KEYTAB_TYPE eztv_codes[IR_KEYTAB_SIZE] = {
         [  1 ] = KEY_TV,             // DVR
         [ 21 ] = KEY_DVD,            // DVD
         [ 23 ] = KEY_AUDIO,          // music
-                                     // DVR mode / DVD mode / music mode
+                                     // DVR mode / DVD mode / music mode
 
         [ 27 ] = KEY_MUTE,           // mute
         [  2 ] = KEY_LANGUAGE,       // MTS/SAP / audio / autoseek
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 86db7fb96efd..caeb47c68b8b 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1345,8 +1345,8 @@ video_poll(struct file *file, struct poll_table_struct *wait)
                                 return POLLERR;
                         }
                         if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,fh->cap.field)) {
-                                up(&fh->cap.lock);
-                                return POLLERR;
+                                up(&fh->cap.lock);
+                                return POLLERR;
                         }
                         fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf);
                         fh->cap.read_off = 0;