Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 65799
b: refs/heads/master
c: 6327e95
h: refs/heads/master
i:
  65797: dea6525
  65795: 9297771
  65791: c7fb569
v: v3
  • Loading branch information
Jesper Juhl authored and Mauro Carvalho Chehab committed Oct 10, 2007
1 parent b110a53 commit fd22578
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 2d4d5f11ecf6df6974579c70461866932f0bd722
refs/heads/master: 6327e952cd3ef5e5a49c84f794dbba72ff3c0e9c
6 changes: 3 additions & 3 deletions trunk/drivers/media/video/ivtv/ivtv-queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ int ivtv_stream_alloc(struct ivtv_stream *s)
s->dma != PCI_DMA_NONE ? "DMA " : "",
s->name, s->buffers, s->buf_size, s->buffers * s->buf_size / 1024);

s->sg_pending = (struct ivtv_sg_element *)kzalloc(SGsize, GFP_KERNEL);
s->sg_pending = kzalloc(SGsize, GFP_KERNEL);
if (s->sg_pending == NULL) {
IVTV_ERR("Could not allocate sg_pending for %s stream\n", s->name);
return -ENOMEM;
}
s->sg_pending_size = 0;

s->sg_processing = (struct ivtv_sg_element *)kzalloc(SGsize, GFP_KERNEL);
s->sg_processing = kzalloc(SGsize, GFP_KERNEL);
if (s->sg_processing == NULL) {
IVTV_ERR("Could not allocate sg_processing for %s stream\n", s->name);
kfree(s->sg_pending);
Expand All @@ -219,7 +219,7 @@ int ivtv_stream_alloc(struct ivtv_stream *s)
}
s->sg_processing_size = 0;

s->sg_dma = (struct ivtv_sg_element *)kzalloc(sizeof(struct ivtv_sg_element), GFP_KERNEL);
s->sg_dma = kzalloc(sizeof(struct ivtv_sg_element), GFP_KERNEL);
if (s->sg_dma == NULL) {
IVTV_ERR("Could not allocate sg_dma for %s stream\n", s->name);
kfree(s->sg_pending);
Expand Down

0 comments on commit fd22578

Please sign in to comment.