summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorHartmut Hackmann <hartmut.hackmann@t-online.de>2007-02-16 01:02:42 +0100
committerHartmut Hackmann <hartmut.hackmann@t-online.de>2007-02-16 01:02:42 +0100
commit8e83a2bfac8e617cc9387dacfaa830d8746f180c (patch)
tree8e68781ea8e32c2166267817a73ca04ea2617483 /linux/drivers/media
parent863e6bd467176febc73a46effb75f3969d87413d (diff)
downloadmediapointer-dvb-s2-8e83a2bfac8e617cc9387dacfaa830d8746f180c.tar.gz
mediapointer-dvb-s2-8e83a2bfac8e617cc9387dacfaa830d8746f180c.tar.bz2
Allow to set tuner_config in attach inform
From: Hartmut Hackmann <hartmut.hackmann@t-online.de> This patch move the assignment of the tuner config and the callback before the check whether it is called in the attach inform. This solves a module load order issue Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/tuner-core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index dd8e8165b..e9dc8271d 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -186,22 +186,22 @@ static void set_type(struct i2c_client *c, unsigned int type,
return;
}
+ t->type = type;
+ t->config = new_config;
+ if (tuner_callback != NULL) {
+ tuner_dbg("defining GPIO callback\n");
+ t->tuner_callback = tuner_callback;
+ }
+
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
/* This code detects calls by card attach_inform */
if (NULL == t->i2c.dev.driver) {
tuner_dbg ("tuner 0x%02x: called during i2c_client register by adapter's attach_inform\n", c->addr);
- t->type=type;
return;
}
#endif
- t->type = type;
- t->config = new_config;
- if (tuner_callback != NULL) {
- tuner_dbg("defining GPIO callback\n");
- t->tuner_callback = tuner_callback;
- }
switch (t->type) {
case TUNER_MT2032:
microtune_init(c);