Merge tag 'memblock-v5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt...

[linux-2.6-microblaze.git] / drivers / staging / media / zoran / zoran_device.c

diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c
index 5b12a73..2470889 100644 (file)
--- a/drivers/staging/media/zoran/zoran_device.c
+++ b/drivers/staging/media/zoran/zoran_device.c
@@ -239,7 +239,7 @@ static void zr36057_set_vfe(struct zoran *zr, int video_width, int video_height,
        wa = tvn->wa;
        ha = tvn->ha;
 
-       pci_info(zr->pci_dev, "set_vfe() - width = %d, height = %d\n", video_width, video_height);
+       pci_dbg(zr->pci_dev, "set_vfe() - width = %d, height = %d\n", video_width, video_height);
 
        if (video_width < BUZ_MIN_WIDTH ||
            video_height < BUZ_MIN_HEIGHT ||
@@ -664,7 +664,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
                zr36057_set_jpg(zr, mode);      // \P_Reset, ... Video param, FIFO
 
                clear_interrupt_counters(zr);
-               pci_info(zr->pci_dev, "enable_jpg(MOTION_COMPRESS)\n");
+               pci_dbg(zr->pci_dev, "enable_jpg(MOTION_COMPRESS)\n");
                break;
        }
 
@@ -693,7 +693,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
                zr36057_set_jpg(zr, mode);      // \P_Reset, ... Video param, FIFO
 
                clear_interrupt_counters(zr);
-               pci_info(zr->pci_dev, "enable_jpg(MOTION_DECOMPRESS)\n");
+               pci_dbg(zr->pci_dev, "enable_jpg(MOTION_DECOMPRESS)\n");
                break;
 
        case BUZ_MODE_IDLE:
@@ -720,7 +720,7 @@ void zr36057_enable_jpg(struct zoran *zr, enum zoran_codec_mode mode)
                decoder_call(zr, video, s_stream, 1);
                encoder_call(zr, video, s_routing, 0, 0, 0);
 
-               pci_info(zr->pci_dev, "enable_jpg(IDLE)\n");
+               pci_dbg(zr->pci_dev, "enable_jpg(IDLE)\n");
                break;
        }
 }
@@ -814,7 +814,7 @@ static void zoran_reap_stat_com(struct zoran *zr)
                if (zr->jpg_settings.tmp_dcm == 1)
                        i = (zr->jpg_dma_tail - zr->jpg_err_shift) & BUZ_MASK_STAT_COM;
                else
-                       i = ((zr->jpg_dma_tail - zr->jpg_err_shift) & 1) * 2 + 1;
+                       i = ((zr->jpg_dma_tail - zr->jpg_err_shift) & 1) * 2;
 
                stat_com = le32_to_cpu(zr->stat_com[i]);
                if ((stat_com & 1) == 0) {
@@ -826,6 +826,11 @@ static void zoran_reap_stat_com(struct zoran *zr)
                size = (stat_com & GENMASK(22, 1)) >> 1;
 
                buf = zr->inuse[i];
+               if (!buf) {
+                       spin_unlock_irqrestore(&zr->queued_bufs_lock, flags);
+                       pci_err(zr->pci_dev, "No buffer at slot %d\n", i);
+                       return;
+               }
                buf->vbuf.vb2_buf.timestamp = ktime_get_ns();
 
                if (zr->codec_mode == BUZ_MODE_MOTION_COMPRESS) {