Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268336
b: refs/heads/master
c: cc9518f
h: refs/heads/master
v: v3
  • Loading branch information
Leonid V. Fedorenchik authored and Greg Kroah-Hartman committed Sep 12, 2011
1 parent 4c7ccc8 commit a18f629
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: 9737153bf048a01781b69a7266df1db17e437b42
refs/heads/master: cc9518fe1466a8f0a9c761618b236db905d350be
6 changes: 3 additions & 3 deletions trunk/drivers/staging/cx25821/cx25821-video-upstream-ch2.c
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ static int cx25821_upstream_buffer_prepare_ch2(struct cx25821_dev *dev,

return 0;

error:
error:
return ret;
}

Expand Down Expand Up @@ -720,7 +720,7 @@ int cx25821_start_video_dma_upstream_ch2(struct cx25821_dev *dev,

return 0;

fail_irq:
fail_irq:
cx25821_dev_unregister(dev);
return err;
}
Expand Down Expand Up @@ -830,7 +830,7 @@ int cx25821_vidupstream_init_ch2(struct cx25821_dev *dev, int channel_select,

return 0;

error:
error:
cx25821_dev_unregister(dev);

return err;
Expand Down

0 comments on commit a18f629

Please sign in to comment.