lkml.org 
[lkml]   [2011]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 17/44] Staging: cx25821: Change indent with spaces to tabs 13
    Date
    Change indent with spaces to tabs.

    Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
    ---
    drivers/staging/cx25821/cx25821-video.c | 60 +++++++++++++++---------------
    1 files changed, 30 insertions(+), 30 deletions(-)

    diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
    index 3af5f2b..958940f 100644
    --- a/drivers/staging/cx25821/cx25821-video.c
    +++ b/drivers/staging/cx25821/cx25821-video.c
    @@ -882,41 +882,41 @@ static ssize_t video_read(struct file *file, char __user * data, size_t count,
    static unsigned int video_poll(struct file *file,
    struct poll_table_struct *wait)
    {
    - struct cx25821_fh *fh = file->private_data;
    - struct cx25821_buffer *buf;
    + struct cx25821_fh *fh = file->private_data;
    + struct cx25821_buffer *buf;

    - if (cx25821_res_check(fh, RESOURCE_VIDEO0)) {
    - /* streaming capture */
    - if (list_empty(&fh->vidq.stream))
    - return POLLERR;
    - buf = list_entry(fh->vidq.stream.next,
    + if (cx25821_res_check(fh, RESOURCE_VIDEO0)) {
    + /* streaming capture */
    + if (list_empty(&fh->vidq.stream))
    + return POLLERR;
    + buf = list_entry(fh->vidq.stream.next,
    struct cx25821_buffer, vb.stream);
    - } else {
    - /* read() capture */
    - buf = (struct cx25821_buffer *)fh->vidq.read_buf;
    - if (NULL == buf)
    - return POLLERR;
    - }
    + } else {
    + /* read() capture */
    + buf = (struct cx25821_buffer *)fh->vidq.read_buf;
    + if (NULL == buf)
    + return POLLERR;
    + }

    - poll_wait(file, &buf->vb.done, wait);
    - if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
    - if (buf->vb.state == VIDEOBUF_DONE) {
    - struct cx25821_dev *dev = fh->dev;
    + poll_wait(file, &buf->vb.done, wait);
    + if (buf->vb.state == VIDEOBUF_DONE || buf->vb.state == VIDEOBUF_ERROR) {
    + if (buf->vb.state == VIDEOBUF_DONE) {
    + struct cx25821_dev *dev = fh->dev;

    - if (dev && dev->channels[fh->channel_id]
    - .use_cif_resolution) {
    - u8 cam_id = *((char *)buf->vb.baddr + 3);
    - memcpy((char *)buf->vb.baddr,
    + if (dev && dev->channels[fh->channel_id]
    + .use_cif_resolution) {
    + u8 cam_id = *((char *)buf->vb.baddr + 3);
    + memcpy((char *)buf->vb.baddr,
    (char *)buf->vb.baddr + (fh->width * 2),
    (fh->width * 2));
    - *((char *)buf->vb.baddr + 3) = cam_id;
    - }
    - }
    + *((char *)buf->vb.baddr + 3) = cam_id;
    + }
    + }

    - return POLLIN | POLLRDNORM;
    - }
    + return POLLIN | POLLRDNORM;
    + }

    - return 0;
    + return 0;
    }

    static int video_release(struct file *file)
    --
    1.7.0.4


    \
     
     \ /
      Last update: 2011-09-16 08:21    [W:0.023 / U:58.984 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site