diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 13:33:48 -0400 |
commit | 15dd859cacf312f606f54502d1f66537a1e5c78c (patch) | |
tree | e50e125eaa6da83fa715704e53c1bde013d1ef8e /sound/i2c/other/tea575x-tuner.c | |
parent | b2d9d33412b9d13a40cd314d93ab517950fc5950 (diff) | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) |
Merge commit 'v2.6.27-rc1' into x86/core
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/i2c/other/tea575x-tuner.c')
-rw-r--r-- | sound/i2c/other/tea575x-tuner.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c index 87e3aefeddc3..83e90057270e 100644 --- a/sound/i2c/other/tea575x-tuner.c +++ b/sound/i2c/other/tea575x-tuner.c | |||
@@ -189,9 +189,7 @@ void snd_tea575x_init(struct snd_tea575x *tea) | |||
189 | } | 189 | } |
190 | 190 | ||
191 | memset(&tea->vd, 0, sizeof(tea->vd)); | 191 | memset(&tea->vd, 0, sizeof(tea->vd)); |
192 | tea->vd.owner = tea->card->module; | ||
193 | strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio"); | 192 | strcpy(tea->vd.name, tea->tea5759 ? "TEA5759 radio" : "TEA5757 radio"); |
194 | tea->vd.type = VID_TYPE_TUNER; | ||
195 | tea->vd.release = snd_tea575x_release; | 193 | tea->vd.release = snd_tea575x_release; |
196 | video_set_drvdata(&tea->vd, tea); | 194 | video_set_drvdata(&tea->vd, tea); |
197 | tea->vd.fops = &tea->fops; | 195 | tea->vd.fops = &tea->fops; |