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>

diff --git a/drivers/media/dvb/dvb-usb/gl861.c b/drivers/media/dvb/dvb-usb/gl861.c
index a35c50c06f9328bf7be3266f68a526c5cd55cf4d..0c9228405cf060574da98671535a438c2f2c8d08 100644 (file)
--- 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,