2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 47b5649729df..ed020f722b05 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -1049,7 +1049,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
                                        IVTV_ENCODER_SIZE);
         if (!itv->enc_mem) {
                 IVTV_ERR("ioremap failed, perhaps increasing __VMALLOC_RESERVE in page.h\n");
-                IVTV_ERR("or disabling CONFIG_HIMEM4G into the kernel would help\n");
+                IVTV_ERR("or disabling CONFIG_HIGHMEM4G into the kernel would help\n");
                 retval = -ENOMEM;
                 goto free_mem;
         }
@@ -1061,7 +1061,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
                                 IVTV_DECODER_SIZE);
                 if (!itv->dec_mem) {
                         IVTV_ERR("ioremap failed, perhaps increasing __VMALLOC_RESERVE in page.h\n");
-                        IVTV_ERR("or disabling CONFIG_HIMEM4G into the kernel would help\n");
+                        IVTV_ERR("or disabling CONFIG_HIGHMEM4G into the kernel would help\n");
                         retval = -ENOMEM;
                         goto free_mem;
                 }
@@ -1077,7 +1077,7 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
             ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
         if (!itv->reg_mem) {
                 IVTV_ERR("ioremap failed, perhaps increasing __VMALLOC_RESERVE in page.h\n");
-                IVTV_ERR("or disabling CONFIG_HIMEM4G into the kernel would help\n");
+                IVTV_ERR("or disabling CONFIG_HIGHMEM4G into the kernel would help\n");
                 retval = -ENOMEM;
                 goto free_io;
         }
diff --git a/drivers/media/video/ivtv/ivtv-fileops.c b/drivers/media/video/ivtv/ivtv-fileops.c
index a7640c49f1d8..2b74b0ab1477 100644
--- a/drivers/media/video/ivtv/ivtv-fileops.c
+++ b/drivers/media/video/ivtv/ivtv-fileops.c
@@ -755,8 +755,10 @@ unsigned int ivtv_v4l2_enc_poll(struct file *filp, poll_table * wait)
         IVTV_DEBUG_HI_FILE("Encoder poll\n");
         poll_wait(filp, &s->waitq, wait);
 
-        if (eof || s->q_full.length || s->q_io.length)
+        if (s->q_full.length || s->q_io.length)
                 return POLLIN | POLLRDNORM;
+        if (eof)
+                return POLLHUP;
         return 0;
 }