These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / usb / tm6000 / tm6000-video.c

diff --git a/kernel/drivers/media/usb/tm6000/tm6000-video.c b/kernel/drivers/media/usb/tm6000/tm6000-video.c
index 77ce9ef..fa5e8bd 100644 (file)
--- a/kernel/drivers/media/usb/tm6000/tm6000-video.c
+++ b/kernel/drivers/media/usb/tm6000/tm6000-video.c
@@ -621,7 +621,7 @@ static int tm6000_prepare_isoc(struct tm6000_core *dev)
                    dev->isoc_in.maxsize, size);
 
 
-       if (!dev->urb_buffer && tm6000_alloc_urb_buffers(dev) < 0) {
+       if (tm6000_alloc_urb_buffers(dev) < 0) {
                tm6000_err("cannot allocate memory for urb buffers\n");
 
                /* call free, as some buffers might have been allocated */
@@ -714,8 +714,7 @@ static void free_buffer(struct videobuf_queue *vq, struct tm6000_buffer *buf)
        struct tm6000_core   *dev = fh->dev;
        unsigned long flags;
 
-       if (in_interrupt())
-               BUG();
+       BUG_ON(in_interrupt());
 
        /* We used to wait for the buffer to finish here, but this didn't work
           because, as we were keeping the state as VIDEOBUF_QUEUED,