From 13f7324f1d09a37227a053d0e64aedf5679e4606 Mon Sep 17 00:00:00 2001 From: "Leonid V. Fedorenchik" Date: Fri, 16 Sep 2011 14:14:39 +0800 Subject: [PATCH] --- yaml --- r: 268430 b: refs/heads/master c: 788d0f33b990d10ad2542ee1dce8a0ebf2fcc335 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/cx25821/cx25821-video.c | 23 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index a4899eb8eba1..d4e50e3ebfc7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69dfe45f7bae456fdee207be49eb1826172a5b16 +refs/heads/master: 788d0f33b990d10ad2542ee1dce8a0ebf2fcc335 diff --git a/trunk/drivers/staging/cx25821/cx25821-video.c b/trunk/drivers/staging/cx25821/cx25821-video.c index a952ca1bb322..206990ec2eab 100644 --- a/trunk/drivers/staging/cx25821/cx25821-video.c +++ b/trunk/drivers/staging/cx25821/cx25821-video.c @@ -424,9 +424,8 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status) if (status & 0x10) { dprintk(2, "stopper video\n"); spin_lock(&dev->slock); - cx25821_restart_video_queue(dev, - &dev->channels[channel->i].vidq, - channel); + cx25821_restart_video_queue(dev, + &dev->channels[channel->i].vidq, channel); spin_unlock(&dev->slock); handled++; } @@ -449,18 +448,18 @@ void cx25821_video_unregister(struct cx25821_dev *dev, int chan_num) { cx_clear(PCI_INT_MSK, 1); - if (dev->channels[chan_num].video_dev) { - if (video_is_registered(dev->channels[chan_num].video_dev)) - video_unregister_device( - dev->channels[chan_num].video_dev); + if (dev->channels[chan_num].video_dev) { + if (video_is_registered(dev->channels[chan_num].video_dev)) + video_unregister_device( + dev->channels[chan_num].video_dev); else - video_device_release( - dev->channels[chan_num].video_dev); + video_device_release( + dev->channels[chan_num].video_dev); - dev->channels[chan_num].video_dev = NULL; + dev->channels[chan_num].video_dev = NULL; - btcx_riscmem_free(dev->pci, - &dev->channels[chan_num].vidq.stopper); + btcx_riscmem_free(dev->pci, + &dev->channels[chan_num].vidq.stopper); pr_warn("device %d released!\n", chan_num); }