14 files changed, 23 insertions, 4 deletions

diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c
index c185422ef28c..faed5a332c71 100644
--- a/drivers/media/IR/imon.c
+++ b/drivers/media/IR/imon.c
@@ -151,7 +151,8 @@ static const struct file_operations vfd_fops = {
         .owner          = THIS_MODULE,
         .open           = &display_open,
         .write          = &vfd_write,
-        .release        = &display_close
+        .release        = &display_close,
+        .llseek         = noop_llseek,
 };
 
 /* lcd character device file operations */
@@ -159,7 +160,8 @@ static const struct file_operations lcd_fops = {
         .owner          = THIS_MODULE,
         .open           = &display_open,
         .write          = &lcd_write,
-        .release        = &display_close
+        .release        = &display_close,
+        .llseek         = noop_llseek,
 };
 
 enum {
diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/IR/ir-lirc-codec.c
index e63f757d5d72..1983cd3f3994 100644
--- a/drivers/media/IR/ir-lirc-codec.c
+++ b/drivers/media/IR/ir-lirc-codec.c
@@ -235,6 +235,7 @@ static struct file_operations lirc_fops = {
         .poll           = lirc_dev_fop_poll,
         .open           = lirc_dev_fop_open,
         .release        = lirc_dev_fop_close,
+        .llseek         = no_llseek,
 };
 
 static int ir_lirc_register(struct input_dev *input_dev)
diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/IR/lirc_dev.c
index 899891bec352..0acf6396e068 100644
--- a/drivers/media/IR/lirc_dev.c
+++ b/drivers/media/IR/lirc_dev.c
@@ -163,6 +163,7 @@ static struct file_operations fops = {
         .unlocked_ioctl = lirc_dev_fop_ioctl,
         .open           = lirc_dev_fop_open,
         .release        = lirc_dev_fop_close,
+        .llseek         = noop_llseek,
 };
 
 static int lirc_cdev_add(struct irctl *ir)
@@ -460,6 +461,8 @@ error:
 
         mutex_unlock(&lirc_dev_lock);
 
+        nonseekable_open(inode, file);
+
         return retval;
 }
 EXPORT_SYMBOL(lirc_dev_fop_open);
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c
index d75788b4e22e..48e48e8af55a 100644
--- a/drivers/media/dvb/bt8xx/dst_ca.c
+++ b/drivers/media/dvb/bt8xx/dst_ca.c
@@ -695,7 +695,8 @@ static const struct file_operations dst_ca_fops = {
         .open = dst_ca_open,
         .release = dst_ca_release,
         .read = dst_ca_read,
-        .write = dst_ca_write
+        .write = dst_ca_write,
+        .llseek = noop_llseek,
 };
 
 static struct dvb_device dvbdev_ca = {
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index 2de13b04b09d..ad1f61d301e1 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -1143,6 +1143,7 @@ static const struct file_operations dvb_demux_fops = {
         .open = dvb_demux_open,
         .release = dvb_demux_release,
         .poll = dvb_demux_poll,
+        .llseek = default_llseek,
 };
 
 static struct dvb_device dvbdev_demux = {
@@ -1212,6 +1213,7 @@ static const struct file_operations dvb_dvr_fops = {
         .open = dvb_dvr_open,
         .release = dvb_dvr_release,
         .poll = dvb_dvr_poll,
+        .llseek = default_llseek,
 };
 
 static struct dvb_device dvbdev_dvr = {
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 1723a984a522..4d0646da6087 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -1622,6 +1622,7 @@ static const struct file_operations dvb_ca_fops = {
         .open = dvb_ca_en50221_io_open,
         .release = dvb_ca_en50221_io_release,
         .poll = dvb_ca_en50221_io_poll,
+        .llseek = noop_llseek,
 };
 
 static struct dvb_device dvbdev_ca = {
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 4d45b7d6b3fb..970c9b8882d4 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -2034,7 +2034,8 @@ static const struct file_operations dvb_frontend_fops = {
         .unlocked_ioctl = dvb_generic_ioctl,
         .poll           = dvb_frontend_poll,
         .open           = dvb_frontend_open,
-        .release        = dvb_frontend_release
+        .release        = dvb_frontend_release,
+        .llseek         = noop_llseek,
 };
 
 int dvb_register_frontend(struct dvb_adapter* dvb,
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index a08032284cbf..4df42aaae7f7 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -1468,6 +1468,7 @@ static const struct file_operations dvb_net_fops = {
         .unlocked_ioctl = dvb_net_ioctl,
         .open = dvb_generic_open,
         .release = dvb_net_close,
+        .llseek = noop_llseek,
 };
 
 static struct dvb_device dvbdev_net = {
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
index 28f486edcaf0..f73287775953 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/drivers/media/dvb/dvb-core/dvbdev.c
@@ -105,6 +105,7 @@ static const struct file_operations dvb_device_fops =
 {
         .owner =        THIS_MODULE,
         .open =         dvb_device_open,
+        .llseek =       noop_llseek,
 };
 
 static struct cdev dvb_device_cdev;
diff --git a/drivers/media/dvb/firewire/firedtv-ci.c b/drivers/media/dvb/firewire/firedtv-ci.c
index d3c2cf60de76..8ffb565f0704 100644
--- a/drivers/media/dvb/firewire/firedtv-ci.c
+++ b/drivers/media/dvb/firewire/firedtv-ci.c
@@ -220,6 +220,7 @@ static const struct file_operations fdtv_ca_fops = {
         .open           = dvb_generic_open,
         .release        = dvb_generic_release,
         .poll           = fdtv_ca_io_poll,
+        .llseek         = noop_llseek,
 };
 
 static struct dvb_device fdtv_ca = {
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index a6be529eec5c..893fbc57c72f 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -730,6 +730,7 @@ static const struct file_operations dvb_osd_fops = {
         .unlocked_ioctl = dvb_generic_ioctl,
         .open           = dvb_generic_open,
         .release        = dvb_generic_release,
+        .llseek         = noop_llseek,
 };
 
 static struct dvb_device dvbdev_osd = {
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 13efba942dac..6ef3996565ad 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -1521,6 +1521,7 @@ static const struct file_operations dvb_video_fops = {
         .open           = dvb_video_open,
         .release        = dvb_video_release,
         .poll           = dvb_video_poll,
+        .llseek         = noop_llseek,
 };
 
 static struct dvb_device dvbdev_video = {
@@ -1539,6 +1540,7 @@ static const struct file_operations dvb_audio_fops = {
         .open           = dvb_audio_open,
         .release        = dvb_audio_release,
         .poll           = dvb_audio_poll,
+        .llseek         = noop_llseek,
 };
 
 static struct dvb_device dvbdev_audio = {
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index 4eba35a018e3..43f61f2eca98 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -353,6 +353,7 @@ static const struct file_operations dvb_ca_fops = {
         .open           = dvb_ca_open,
         .release        = dvb_generic_release,
         .poll           = dvb_ca_poll,
+        .llseek         = default_llseek,
 };
 
 static struct dvb_device dvbdev_ca = {
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index b070e88d8c6b..908f272fe26c 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -312,6 +312,7 @@ static ssize_t av7110_ir_proc_write(struct file *file, const char __user *buffer
 static const struct file_operations av7110_ir_proc_fops = {
         .owner          = THIS_MODULE,
         .write          = av7110_ir_proc_write,
+        .llseek         = noop_llseek,
 };
 
 /* interrupt handler */