summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-08-26 02:59:53 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-05 14:52:23 -0700
commit66c644d7226b430e499757177c27872ba3479b23 (patch)
treeb3e813fa88816c243f2c41a737441db046f0a11d
parentb842c478ae2f02576bcada28babe0afec6e4725b (diff)
downloadlinux-stable-66c644d7226b430e499757177c27872ba3479b23.tar.gz
linux-stable-66c644d7226b430e499757177c27872ba3479b23.tar.bz2
linux-stable-66c644d7226b430e499757177c27872ba3479b23.zip
media: cx18: fix kernel oops with tda8290 tuner
commit 6a03dc92cc2edfa2257502557b9f714893987383 upstream. This was caused by an uninitialized setup.config field. Based on a suggestion from Devin Heitmueller. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Thanks-to: Devin Heitmueller <dheitmueller@kernellabs.com> Reported-by: Scott Robinson <scott.robinson55@gmail.com> Tested-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/media/pci/cx18/cx18-driver.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 716bdc57fac6..83f5074706f9 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -1091,6 +1091,7 @@ static int cx18_probe(struct pci_dev *pci_dev,
setup.addr = ADDR_UNSET;
setup.type = cx->options.tuner;
setup.mode_mask = T_ANALOG_TV; /* matches TV tuners */
+ setup.config = NULL;
if (cx->options.radio > 0)
setup.mode_mask |= T_RADIO;
setup.tuner_callback = (setup.type == TUNER_XC2028) ?