---

yaml
---
r: 181565
b: refs/heads/master
c: 780edb7
h: refs/heads/master
i:
  181563: 970e138
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dae2f0f84374d4e7cd6c8d41385a7c250f0726d
+refs/heads/master: 780edb7ad60e5c657770f510747cc609c84b5b61

trunk/drivers/media/video/cx18/cx18-alsa-pcm.c

@@ -85,9 +85,9 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream)
 
 	/* Allocate memory */
 	item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL);
-	if (NULL == item) {
+	if (NULL == item)
 		return -ENOMEM;
-	}
+
 	item->cx = cx;
 	item->type = s->type;
 	item->open_id = cx->open_id++;
@@ -223,7 +223,6 @@ snd_pcm_uframes_t snd_cx18_pcm_pointer(struct snd_pcm_substream *substream)
 	return hwptr_done;
 }
 
-
 static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
 					     unsigned long offset)
 {
@@ -341,7 +340,8 @@ int snd_cx18_pcm_create(struct snd_cx18_card *cxsc)
 
 	spin_lock_init(&cxsc->slock);
 
-	snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE, &snd_cx18_pcm_capture_ops);
+	snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE,
+			&snd_cx18_pcm_capture_ops);
 	sp->info_flags = 0;
 	sp->private_data = cxsc;
 	strlcpy(sp->name, cx->card_name, sizeof(sp->name));