summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Nijs <jan.nijs@scarlet.be>2006-10-07 01:25:53 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:35:28 -0200
commitb3b2b8b5746cfe5af181dc2ce7a0912b5b2c598a (patch)
tree1e100ba5b1c0cd093c18619ac6b3ad407842931a
parent1f78867bc8a05b6c0bc3f2cb1c5915c10e92369e (diff)
downloadlinux-b3b2b8b5746cfe5af181dc2ce7a0912b5b2c598a.tar.gz
linux-b3b2b8b5746cfe5af181dc2ce7a0912b5b2c598a.tar.bz2
linux-b3b2b8b5746cfe5af181dc2ce7a0912b5b2c598a.zip
V4L/DVB (5232): Gl861: correct oops when loading module
This patch moves the DVB_USB_IS_AN_I2C_ADAPTER flag from the adapter properties to the device properties. Without this patch I get an OOPS when the gl861 driver tries to access any registers. Signed-off-by: Jan Nijs <jan.nijs@scarlet.be> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/dvb-usb/gl861.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index a35c50c06f93..0c9228405cf0 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -150,6 +150,7 @@ static struct usb_device_id gl861_table [] = {
MODULE_DEVICE_TABLE (usb, gl861_table);
static struct dvb_usb_device_properties gl861_properties = {
+ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
.usb_ctrl = DEVICE_SPECIFIC,
.size_of_priv = 0,
@@ -157,7 +158,6 @@ static struct dvb_usb_device_properties gl861_properties = {
.identify_state = gl861_identify_state,
.num_adapters = 1,
.adapter = {{
- .caps = DVB_USB_IS_AN_I2C_ADAPTER,
.frontend_attach = gl861_frontend_attach,
.tuner_attach = qt1010_tuner_attach,