aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf-dvb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/videobuf-dvb.c')
-rw-r--r--drivers/media/video/videobuf-dvb.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c
index a0a80e1e79e3..af0b75cda6fd 100644
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/video/videobuf-dvb.c
@@ -140,7 +140,8 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
140 struct module *module, 140 struct module *module,
141 void *adapter_priv, 141 void *adapter_priv,
142 struct device *device, 142 struct device *device,
143 short *adapter_nr) //NEW 143 short *adapter_nr,
144 int mfe_shared)
144{ 145{
145 struct list_head *list, *q; 146 struct list_head *list, *q;
146 struct videobuf_dvb_frontend *fe; 147 struct videobuf_dvb_frontend *fe;
@@ -153,7 +154,7 @@ int videobuf_dvb_register_bus(struct videobuf_dvb_frontends *f,
153 } 154 }
154 155
155 /* Bring up the adapter */ 156 /* Bring up the adapter */
156 res = videobuf_dvb_register_adapter(f, module, adapter_priv, device, fe->dvb.name, adapter_nr); //NEW 157 res = videobuf_dvb_register_adapter(f, module, adapter_priv, device, fe->dvb.name, adapter_nr, mfe_shared);
157 if (res < 0) { 158 if (res < 0) {
158 printk(KERN_WARNING "videobuf_dvb_register_adapter failed (errno = %d)\n", res); 159 printk(KERN_WARNING "videobuf_dvb_register_adapter failed (errno = %d)\n", res);
159 goto err; 160 goto err;
@@ -181,7 +182,8 @@ int videobuf_dvb_register_adapter(struct videobuf_dvb_frontends *fe,
181 void *adapter_priv, 182 void *adapter_priv,
182 struct device *device, 183 struct device *device,
183 char *adapter_name, 184 char *adapter_name,
184 short *adapter_nr) //NEW 185 short *adapter_nr,
186 int mfe_shared)
185{ 187{
186 int result; 188 int result;
187 189
@@ -194,6 +196,7 @@ int videobuf_dvb_register_adapter(struct videobuf_dvb_frontends *fe,
194 adapter_name, result); 196 adapter_name, result);
195 } 197 }
196 fe->adapter.priv = adapter_priv; 198 fe->adapter.priv = adapter_priv;
199 fe->adapter.mfe_shared = mfe_shared;
197 200
198 return result; 201 return result;
199} 202}