diff --git a/[refs] b/[refs]
index 220e10bfc33e..654d3e5de373 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e85fc1b9fc1c7e20b9a01f2314bb633bb10501a
+refs/heads/master: 71d676345698b275955b2584803ae550972249e5
diff --git a/trunk/drivers/media/dvb/dvb-usb/anysee.c b/trunk/drivers/media/dvb/dvb-usb/anysee.c
index fdee856acab0..ecc3addc77ec 100644
--- a/trunk/drivers/media/dvb/dvb-usb/anysee.c
+++ b/trunk/drivers/media/dvb/dvb-usb/anysee.c
@@ -887,7 +887,8 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
 
 		/* attach demod */
 		adap->fe_adap[state->fe_id].fe = dvb_attach(cxd2820r_attach,
-				&anysee_cxd2820r_config, &adap->dev->i2c_adap);
+				&anysee_cxd2820r_config, &adap->dev->i2c_adap,
+				NULL);
 
 		state->has_ci = true;
 
@@ -1188,14 +1189,6 @@ static int anysee_ci_init(struct dvb_usb_device *d)
 	if (ret)
 		return ret;
 
-	ret = anysee_wr_reg_mask(d, REG_IOD, (0 << 2)|(0 << 1)|(0 << 0), 0x07);
-	if (ret)
-		return ret;
-
-	ret = anysee_wr_reg_mask(d, REG_IOD, (1 << 2)|(1 << 1)|(1 << 0), 0x07);
-	if (ret)
-		return ret;
-
 	ret = dvb_ca_en50221_init(&d->adapter[0].dvb_adap, &state->ci, 0, 1);
 	if (ret)
 		return ret;
diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.c b/trunk/drivers/media/dvb/dvb-usb/az6007.c
new file mode 100644
index 000000000000..cd5dd4cecd0b
--- /dev/null
+++ b/trunk/drivers/media/dvb/dvb-usb/az6007.c
@@ -0,0 +1,627 @@
+/* DVB USB compliant Linux driver for the AzureWave 6017 USB2.0 DVB-S
+ * receiver.
+ * see Documentation/dvb/README.dvb-usb for more information
+ */
+
+#include "az6007.h"
+#include "drxk.h"
+#include "mt2063.h"
+#include "dvb_ca_en50221.h"
+
+/* debug */
+int dvb_usb_az6007_debug;
+module_param_named(debug,dvb_usb_az6007_debug, int, 0644);
+MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))." DVB_USB_DEBUG_STATUS);
+
+
+static int az6007_type =0;
+module_param(az6007_type, int, 0644);
+MODULE_PARM_DESC(az6007_type, "select delivery mode (0=DVB-T, 1=DVB-T");
+
+//module_param_named(type, 6007_type, int, 0644);
+//MODULE_PARM_DESC(type, "select delivery mode (0=DVB-T, 1=DVB-C)");
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+
+struct az6007_device_state {
+	struct dvb_ca_en50221 ca;
+	struct mutex ca_mutex;
+	u8 power_state;
+};
+
+struct drxk3913_config az6007_drxk3913_config_DVBT = {	
+	.demod_address = 0x52,
+	.min_delay_ms = 100,
+	.standard	= MTTUNEA_DVBT,
+	.set_tuner = mt2063_setTune,
+	.tuner_getlocked = mt2063_lockStatus,
+	.tuner_MT2063_Open = tuner_MT2063_Open,
+	.tuner_MT2063_SoftwareShutdown = tuner_MT2063_SoftwareShutdown,
+	.tuner_MT2063_ClearPowerMaskBits = tuner_MT2063_ClearPowerMaskBits,
+};
+
+struct drxk3913_config az6007_drxk3913_config_DVBC = {	
+	.demod_address = 0x52,
+	.min_delay_ms = 100,
+	.standard	= MTTUNEA_DVBC,
+	.set_tuner = mt2063_setTune,
+	.tuner_getlocked = mt2063_lockStatus,
+	.tuner_MT2063_Open = tuner_MT2063_Open,
+	.tuner_MT2063_SoftwareShutdown = tuner_MT2063_SoftwareShutdown,
+	.tuner_MT2063_ClearPowerMaskBits = tuner_MT2063_ClearPowerMaskBits,
+};
+
+struct mt2063_config az6007_mt2063_config = {
+	.tuner_address = 0xc0,
+	.refclock = 36125000,
+};
+
+/* check for mutex FIXME */
+int az6007_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen)
+{
+	int ret = -1;
+
+		ret = usb_control_msg(d->udev,
+			usb_rcvctrlpipe(d->udev,0),
+			req,
+			USB_TYPE_VENDOR | USB_DIR_IN,
+			value,index,b,blen,
+			5000);
+
+	if (ret < 0) {
+		warn("usb in operation failed. (%d)", ret);
+		ret = -EIO;
+	} else
+		ret = 0;
+
+
+	deb_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: ",req,value,index);
+	debug_dump(b,blen,deb_xfer);
+
+	return ret;
+}
+
+static int az6007_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
+			     u16 index, u8 *b, int blen)
+{
+	int ret;
+
+#if 0	
+	int i=0, cyc=0, rem=0;
+	cyc = blen/64;
+	rem = blen%64;
+#endif
+
+	deb_xfer("out: req. %02x, val: %04x, ind: %04x, buffer: ",req,value,index);
+	debug_dump(b,blen,deb_xfer);
+
+	
+#if 0
+	if (blen>64)
+	{
+		for (i=0; i<cyc; i++)
+		{
+			if ((ret = usb_control_msg(d->udev,
+				usb_sndctrlpipe(d->udev,0),
+				req,
+				USB_TYPE_VENDOR | USB_DIR_OUT,
+				value,index+i*64,b+i*64,64,
+				5000)) != 64) {
+				warn("usb out operation failed. (%d)",ret);
+				return -EIO;
+			}	
+		}
+
+		if (rem>0)
+		{
+			if ((ret = usb_control_msg(d->udev,
+				usb_sndctrlpipe(d->udev,0),
+				req,
+				USB_TYPE_VENDOR | USB_DIR_OUT,
+				value,index+cyc*64,b+cyc*64,rem,
+				5000)) != rem) {
+				warn("usb out operation failed. (%d)",ret);
+				return -EIO;
+			}
+		}
+	}
+	else
+#endif		
+	{
+		if ((ret = usb_control_msg(d->udev,
+				usb_sndctrlpipe(d->udev,0),
+				req,
+				USB_TYPE_VENDOR | USB_DIR_OUT,
+				value,index,b,blen,
+				5000)) != blen) {
+			warn("usb out operation failed. (%d)",ret);
+			return -EIO;
+		}
+	}
+	
+	return 0;
+}
+
+static int az6007_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
+{
+	return 0;
+}
+
+/* keys for the enclosed remote control */
+static struct dvb_usb_rc_key az6007_rc_keys[] = {
+	{ 0x00, 0x01, KEY_1 },
+	{ 0x00, 0x02, KEY_2 },
+};
+
+/* remote control stuff (does not work with my box) */
+static int az6007_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
+{
+	return 0;
+#if 0
+	u8 key[10];
+	int i;
+
+/* remove the following return to enabled remote querying */
+	
+
+	az6007_usb_in_op(d,READ_REMOTE_REQ,0,0,key,10);
+
+	deb_rc("remote query key: %x %d\n",key[1],key[1]);
+
+	if (key[1] == 0x44) {
+		*state = REMOTE_NO_KEY_PRESSED;
+		return 0;
+	}
+
+	for (i = 0; i < ARRAY_SIZE(az6007_rc_keys); i++)
+		if (az6007_rc_keys[i].custom == key[1]) {
+			*state = REMOTE_KEY_PRESSED;
+			*event = az6007_rc_keys[i].event;
+			break;
+		}
+	return 0;
+#endif
+}
+
+/*
+int az6007_power_ctrl(struct dvb_usb_device *d, int onoff)
+{
+	u8 v = onoff;
+	return az6007_usb_out_op(d,0xBC,v,3,NULL,1);
+}
+*/
+
+static int az6007_read_mac_addr(struct dvb_usb_device *d,u8 mac[6])
+{
+	az6007_usb_in_op(d, 0xb7, 6, 0, &mac[0], 6);
+	return 0;
+}
+
+static int az6007_frontend_poweron(struct dvb_usb_adapter *adap)
+{
+	int ret;
+	u8 req;
+	u16 value;
+	u16 index;
+	int blen;
+
+	info("az6007_frontend_poweron adap=%p adap->dev=%p\n", adap, adap->dev);
+
+	req = 0xBC;
+	value = 1;//power on
+	index = 3;
+	blen =0;
+
+	if((ret = az6007_usb_out_op(adap->dev,req,value,index,NULL,blen)) != 0)
+	{
+		err("az6007_frontend_poweron failed!!!");
+		 return -EIO;
+	}
+
+	msleep_interruptible(200);
+
+	req = 0xBC;
+	value = 0;//power on
+	index = 3;
+	blen =0;
+
+	if((ret = az6007_usb_out_op(adap->dev,req,value,index,NULL,blen)) != 0)
+	{
+		err("az6007_frontend_poweron failed!!!");
+		 return -EIO;
+	}
+
+	msleep_interruptible(200);
+
+	req = 0xBC;
+	value = 1;//power on
+	index = 3;
+	blen =0;
+
+	if((ret = az6007_usb_out_op(adap->dev,req,value,index,NULL,blen)) != 0)
+	{
+		err("az6007_frontend_poweron failed!!!");
+		 return -EIO;
+	}
+	info("az6007_frontend_poweron\n");
+	return 0;
+}
+
+static int az6007_frontend_reset(struct dvb_usb_adapter *adap)
+{
+	int ret;
+	u8 req;
+	u16 value;
+	u16 index;
+	int blen;
+
+	info("az6007_frontend_reset adap=%p adap->dev=%p\n", adap, adap->dev);
+	
+	//reset demodulator
+	req = 0xC0;
+	value = 1;//high
+	index = 3;
+	blen =0;
+	if((ret = az6007_usb_out_op(adap->dev,req,value,index,NULL,blen)) != 0)
+	{
+		err("az6007_frontend_reset failed 1 !!!");
+		   return -EIO;
+	}
+	
+	req = 0xC0;
+	value = 0;//low
+	index = 3;
+	blen =0;
+	msleep_interruptible(200);
+	if((ret = az6007_usb_out_op(adap->dev,req,value,index,NULL,blen)) != 0)
+	{
+		err("az6007_frontend_reset failed 2 !!!");
+		   return -EIO;
+	}
+	msleep_interruptible(200);
+	req = 0xC0;
+	value = 1;//high
+	index = 3;
+	blen =0;
+
+	if((ret = az6007_usb_out_op(adap->dev,req,value,index,NULL,blen)) != 0)
+	{
+		err("az6007_frontend_reset failed 3 !!!");
+		   return -EIO;
+	}
+	
+	msleep_interruptible(200);
+	
+	info("reset az6007 frontend\n");
+	
+	return 0;
+}
+
+static int az6007_led_on_off(struct usb_interface *intf, int onoff)
+{
+	int ret = -1;
+	u8 req;
+	u16 value;
+	u16 index;
+	int blen;
+	//TS through
+	req = 0xBC;
+	value = onoff;
+	index = 0;
+	blen =0;
+
+	ret = usb_control_msg(interface_to_usbdev(intf),
+		usb_rcvctrlpipe(interface_to_usbdev(intf),0),
+		req,
+		USB_TYPE_VENDOR | USB_DIR_OUT,
+		value,index,NULL,blen,
+		2000);
+
+	if (ret < 0) {
+		warn("usb in operation failed. (%d)", ret);
+		ret = -EIO;
+	} else
+		ret = 0;
+
+
+	deb_xfer("in: req. %02x, val: %04x, ind: %04x, buffer: ",req,value,index);
+
+	return ret;
+}
+
+static int az6007_frontend_tsbypass(struct dvb_usb_adapter *adap,int onoff)
+{
+	int ret;
+	u8 req;
+	u16 value;
+	u16 index;
+	int blen;
+	//TS through
+	req = 0xC7;
+	value = onoff;
+	index = 0;
+	blen =0;
+
+	if((ret = az6007_usb_out_op(adap->dev,req,value,index,NULL,blen)) != 0)
+		   return -EIO;
+	return 0;
+}
+
+static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
+{
+	az6007_frontend_poweron(adap);
+	az6007_frontend_reset(adap);
+
+	info("az6007_frontend_attach\n");
+
+	if (az6007_type == 0)
+	{
+		info("az6007_drxk3913_config_DVBT\n");
+		adap->fe = drxk3913_attach(&az6007_drxk3913_config_DVBT, &adap->dev->i2c_adap);
+	}
+	else
+	{
+		info("az6007_drxk3913_config_DVBC\n");
+		adap->fe = drxk3913_attach(&az6007_drxk3913_config_DVBC, &adap->dev->i2c_adap);
+	}
+	if (adap->fe) {		
+		if (mt2063_attach(adap->fe, &az6007_mt2063_config, &adap->dev->i2c_adap)) {
+			info("found STB6100 DVB-C/DVB-T frontend @0x%02x\n",az6007_mt2063_config.tuner_address);
+			
+			//vp6027_ci_init(adap);
+		} else {
+			adap->fe = NULL;
+		}
+	}
+	else
+	{
+		adap->fe = NULL;	
+		err("no front-end attached\n");
+	}
+	//az6007_frontend_tsbypass(adap,0);
+	
+	return 0;
+}
+
+static struct dvb_usb_device_properties az6007_properties;
+
+static void
+az6007_usb_disconnect(struct usb_interface *intf)
+{
+	dvb_usb_device_exit (intf);
+}
+
+/* I2C */
+static int az6007_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
+{
+	struct dvb_usb_device *d = i2c_get_adapdata(adap);
+	int j=0,len=0;
+	int ret=0;
+	u16 index;
+	u16 value;
+	int length;
+	u8 req;
+	u8 data[512];
+	
+	if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
+		return -EAGAIN;
+	if (num > 2)
+		warn("more than 2 i2c messages at a time is not handled yet. TODO.");
+
+
+	if (msg[0].addr == 0xc0) //MT2063
+	{
+		if (msg[0].flags != I2C_M_RD) //write
+		{
+			//printk("Tuner Tuner Write DevAddr=%02x  RegAddr=%d\n", msg[0].addr, msg[0].buf[0]);
+			req = 0xBD;
+			index = msg[0].buf[0];
+			value = msg[0].addr | (1<<8);
+			length = msg[0].len - 1;
+			len = msg[0].len - 1;
+			//printk("Tuner Tuner WriteDATA len=%d ", len);
+			for(j=0;j<len;j++)
+			{
+				data[j] = msg[0].buf[j+1];
+				//printk("data[%d]=%02x ", j, data[j]);
+			}
+			//printk("\n");
+			ret = az6007_usb_out_op(d,req,value,index,data,length);
+			//ret = az6007_usb_out_op(d,req,value,index,&(msg[0].buf[1]),length);
+		}
+		else //read
+		{
+			//printk("Tuner Tuner Read DevAddr=%02x RegAddr=%02x\n", msg[0].addr, msg[0].buf[0]);
+			req = 0xB9;
+			index = msg[0].buf[0];
+			value = msg[0].addr + (1 << 8);
+			length = msg[1].len + 6;
+			ret = az6007_usb_in_op(d,req,value,index,data,length);
+			len = msg[1].len;
+			//printk("Tuner Tuner ReadDATA len=%d ", len);
+			for (j=0; j<len; j++)
+			{
+				msg[1].buf[j] = data[j+5];	
+				//printk("data[%d]=%02x ", j, data[j+5]);
+			}
+			//printk("\n");
+		}
+	}
+	else
+	{	//Demodulator
+		if (msg[0].flags != I2C_M_RD) //write
+		{
+			//printk("Demodulator Write DevAddr=%02x  RegAddr=%d\n", msg[0].addr, msg[0].buf[0]);
+			req = 0xBD;
+			index = msg[0].buf[0];
+			value = msg[0].addr | (1<<8);
+			length = msg[0].len - 1;
+			len = msg[0].len - 1;
+			//printk("Demodulator WriteDATA len=%d ", len);			
+			for(j=0;j<len;j++)
+			{
+				data[j] = msg[0].buf[j+1];
+				//printk("data[%d]=%02x ", j, data[j]);
+			}
+			//printk("\n");			
+			ret = az6007_usb_out_op(d,req,value,index,data,length);
+		}
+		else //read
+		{
+			//printk("Demodulator Read DevAddr=%02x RegAddr=%02x\n", msg[0].addr, msg[0].buf[0]);
+			req = 0xB9;
+			index = 0;
+			value = msg[0].addr + (0 << 8);
+			length = msg[0].len + 6;
+			ret = az6007_usb_in_op(d,req,value,index,data,length);
+			len = msg[0].len;
+			//printk("Demodulator ReadDATA len=%d ", len);
+			for (j=0; j<len; j++)
+			{
+				msg[0].buf[j] = data[j+5];	
+				//printk("data[%d]=%02x ", j, data[j+5]);
+			}
+			//printk("\n");
+		}
+	}
+	mutex_unlock(&d->i2c_mutex);
+	return ret;
+}
+
+
+static u32 az6007_i2c_func(struct i2c_adapter *adapter)
+{
+	return I2C_FUNC_I2C;
+}
+
+static struct i2c_algorithm az6007_i2c_algo = {
+	.master_xfer   = az6007_i2c_xfer,
+	.functionality = az6007_i2c_func,
+#ifdef NEED_ALGO_CONTROL
+	.algo_control = dummy_algo_control,
+#endif
+};
+
+int az6007_identify_state(struct usb_device *udev, struct dvb_usb_device_properties *props,
+			struct dvb_usb_device_description **desc, int *cold)
+{
+	u8 b[16];
+	s16 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev,0),
+		0xb7, USB_TYPE_VENDOR | USB_DIR_IN, 6, 0, b, 6, USB_CTRL_GET_TIMEOUT);
+
+	info("FW GET_VERSION length: %d\n",ret);
+
+	*cold = ret <= 0;
+
+	info("cold: %d\n", *cold);
+	return 0;
+}
+
+static int az6007_usb_probe(struct usb_interface *intf,
+		const struct usb_device_id *id)
+{
+	az6007_led_on_off(intf, 0);	
+		
+	return dvb_usb_device_init(intf, &az6007_properties,
+				   THIS_MODULE, NULL, adapter_nr);	
+}
+
+static struct usb_device_id az6007_usb_table [] = {
+	    { USB_DEVICE(USB_VID_AZUREWAVE, USB_PID_AZUREWAVE_6007) },
+	    { USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7) },
+	    { 0 },
+};
+
+MODULE_DEVICE_TABLE(usb, az6007_usb_table);
+
+static struct dvb_usb_device_properties az6007_properties = {
+	.caps = DVB_USB_IS_AN_I2C_ADAPTER,
+	.usb_ctrl = CYPRESS_FX2,
+	//.download_firmware = az6007_download_firmware,
+	.firmware            = "dvb-usb-az6007-03.fw",
+	.no_reconnect        = 1,
+
+	.size_of_priv     = sizeof(struct az6007_device_state),
+	.identify_state		= az6007_identify_state,
+	.num_adapters = 1,
+	.adapter = {
+		{
+			//.caps             = DVB_USB_ADAP_RECEIVES_204_BYTE_TS,
+
+			.streaming_ctrl   = az6007_streaming_ctrl,
+			.frontend_attach  = az6007_frontend_attach,
+
+			/* parameter for the MPEG2-data transfer */
+			.stream = {
+				.type = USB_BULK,
+				.count = 10,
+				.endpoint = 0x02,
+				.u = {
+					.bulk = {
+						.buffersize = 4096,
+					}
+				}
+			},
+			.size_of_priv     = 0,//sizeof(struct az6007_state),
+		}
+	},
+	//.power_ctrl       = az6007_power_ctrl,
+	.read_mac_address = az6007_read_mac_addr,
+
+	.rc_key_map       = az6007_rc_keys,
+	.rc_key_map_size  = ARRAY_SIZE(az6007_rc_keys),
+	.rc_interval      = 400,
+	.rc_query         = az6007_rc_query,
+	.i2c_algo         = &az6007_i2c_algo,
+
+	.num_device_descs = 2,
+	.devices = {
+		{ .name = "AzureWave DTV StarBox DVB-T/C USB2.0 (az6007)",
+		  .cold_ids = { &az6007_usb_table[0], NULL },
+		  .warm_ids = { NULL },
+		},
+		{ .name = "TerraTec DTV StarBox DVB-T/C USB2.0 (az6007)",
+		  .cold_ids = { &az6007_usb_table[1], NULL },
+		  .warm_ids = { NULL },
+		},
+ 		{ NULL },
+	}
+};
+  
+/* usb specific object needed to register this driver with the usb subsystem */
+static struct usb_driver az6007_usb_driver = {
+	.name		= "dvb_usb_az6007",
+	.probe 		= az6007_usb_probe,
+	.disconnect = dvb_usb_device_exit,
+	//.disconnect 	= az6007_usb_disconnect,
+	.id_table 	= az6007_usb_table,
+};
+
+/* module stuff */
+static int __init az6007_usb_module_init(void)
+{
+	int result;
+	info("henry :: az6007 usb module init");
+	if ((result = usb_register(&az6007_usb_driver))) {
+		err("usb_register failed. (%d)",result);
+		return result;
+	}
+
+	return 0;
+}
+
+static void __exit az6007_usb_module_exit(void)
+{
+	/* deregister this driver from the USB subsystem */
+	info("henry :: az6007 usb module exit");
+	usb_deregister(&az6007_usb_driver);
+}
+
+module_init(az6007_usb_module_init);
+module_exit(az6007_usb_module_exit);
+
+MODULE_AUTHOR("Henry Wang <Henry.wang@AzureWave.com>");
+MODULE_DESCRIPTION("Driver for AzureWave 6007 DVB-C/T USB2.0 and clones");
+MODULE_VERSION("1.0");
+MODULE_LICENSE("GPL");
diff --git a/trunk/drivers/media/dvb/dvb-usb/az6007.h b/trunk/drivers/media/dvb/dvb-usb/az6007.h
new file mode 100644
index 000000000000..aefa5b506ee6
--- /dev/null
+++ b/trunk/drivers/media/dvb/dvb-usb/az6007.h
@@ -0,0 +1,18 @@
+#ifndef _DVB_USB_AZ6007_H_
+#define _DVB_USB_AZ6007_H_
+
+#define DVB_USB_LOG_PREFIX "az6007"
+#include "dvb-usb.h"
+
+
+extern int dvb_usb_az6007_debug;
+#define deb_info(args...) dprintk(dvb_usb_az6007_debug,0x01,args)
+#define deb_xfer(args...) dprintk(dvb_usb_az6007_debug,0x02,args)
+#define deb_rc(args...)   dprintk(dvb_usb_az6007_debug,0x04,args)
+#define deb_fe(args...)   dprintk(dvb_usb_az6007_debug,0x08,args)
+
+
+extern int vp702x_usb_out_op(struct dvb_usb_device *d, u8 *o, int olen, u8 *i, int ilen, int msec);
+extern int vp702x_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen);
+
+#endif
diff --git a/trunk/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/trunk/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
index 1efc028a76c9..8a57ed8272de 100644
--- a/trunk/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
+++ b/trunk/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
@@ -276,15 +276,14 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
 	param.flags = 0;
 
 	switch (fep->bandwidth_hz) {
-	default:
 	case 8000000:
-		param.bandwidth = 8;
+		param.bandwidth = 0;
 		break;
 	case 7000000:
-		param.bandwidth = 7;
+		param.bandwidth = 1;
 		break;
 	case 6000000:
-		param.bandwidth = 6;
+		param.bandwidth = 2;
 		break;
 	}
 
diff --git a/trunk/drivers/media/dvb/frontends/cxd2820r.h b/trunk/drivers/media/dvb/frontends/cxd2820r.h
index 5aa306ebb7ef..cf0f546aa1d1 100644
--- a/trunk/drivers/media/dvb/frontends/cxd2820r.h
+++ b/trunk/drivers/media/dvb/frontends/cxd2820r.h
@@ -77,12 +77,14 @@ struct cxd2820r_config {
 	(defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE))
 extern struct dvb_frontend *cxd2820r_attach(
 	const struct cxd2820r_config *config,
-	struct i2c_adapter *i2c
+	struct i2c_adapter *i2c,
+	struct dvb_frontend *fe
 );
 #else
 static inline struct dvb_frontend *cxd2820r_attach(
 	const struct cxd2820r_config *config,
-	struct i2c_adapter *i2c
+	struct i2c_adapter *i2c,
+	struct dvb_frontend *fe
 )
 {
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
diff --git a/trunk/drivers/media/dvb/frontends/cxd2820r_core.c b/trunk/drivers/media/dvb/frontends/cxd2820r_core.c
index 5c7c2aaf9bf5..caae7f79c837 100644
--- a/trunk/drivers/media/dvb/frontends/cxd2820r_core.c
+++ b/trunk/drivers/media/dvb/frontends/cxd2820r_core.c
@@ -482,19 +482,10 @@ static enum dvbfe_search cxd2820r_search(struct dvb_frontend *fe)
 
 	/* switch between DVB-T and DVB-T2 when tune fails */
 	if (priv->last_tune_failed) {
-		if (priv->delivery_system == SYS_DVBT) {
-			ret = cxd2820r_sleep_t(fe);
-			if (ret)
-				goto error;
-
+		if (priv->delivery_system == SYS_DVBT)
 			c->delivery_system = SYS_DVBT2;
-		} else if (priv->delivery_system == SYS_DVBT2) {
-			ret = cxd2820r_sleep_t2(fe);
-			if (ret)
-				goto error;
-
+		else if (priv->delivery_system == SYS_DVBT2)
 			c->delivery_system = SYS_DVBT;
-		}
 	}
 
 	/* set frontend */
@@ -571,7 +562,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
 	.delsys = { SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_A },
 	/* default: DVB-T/T2 */
 	.info = {
-		.name = "Sony CXD2820R",
+		.name = "Sony CXD2820R (DVB-T/T2)",
 
 		.caps =	FE_CAN_FEC_1_2			|
 			FE_CAN_FEC_2_3			|
@@ -581,9 +572,7 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
 			FE_CAN_FEC_AUTO			|
 			FE_CAN_QPSK			|
 			FE_CAN_QAM_16			|
-			FE_CAN_QAM_32			|
 			FE_CAN_QAM_64			|
-			FE_CAN_QAM_128			|
 			FE_CAN_QAM_256			|
 			FE_CAN_QAM_AUTO			|
 			FE_CAN_TRANSMISSION_MODE_AUTO	|
@@ -613,7 +602,8 @@ static const struct dvb_frontend_ops cxd2820r_ops = {
 };
 
 struct dvb_frontend *cxd2820r_attach(const struct cxd2820r_config *cfg,
-		struct i2c_adapter *i2c)
+				     struct i2c_adapter *i2c,
+				     struct dvb_frontend *fe)
 {
 	struct cxd2820r_priv *priv = NULL;
 	int ret;
diff --git a/trunk/drivers/media/dvb/frontends/tda10071.c b/trunk/drivers/media/dvb/frontends/tda10071.c
index c21bc92d2811..a99205026751 100644
--- a/trunk/drivers/media/dvb/frontends/tda10071.c
+++ b/trunk/drivers/media/dvb/frontends/tda10071.c
@@ -1215,7 +1215,7 @@ struct dvb_frontend *tda10071_attach(const struct tda10071_config *config,
 EXPORT_SYMBOL(tda10071_attach);
 
 static struct dvb_frontend_ops tda10071_ops = {
-	.delsys = { SYS_DVBS, SYS_DVBS2 },
+	.delsys = { SYS_DVBT, SYS_DVBT2 },
 	.info = {
 		.name = "NXP TDA10071",
 		.frequency_min = 950000,
diff --git a/trunk/drivers/media/dvb/siano/smsdvb.c b/trunk/drivers/media/dvb/siano/smsdvb.c
index aa77e54a8fae..654685c9303e 100644
--- a/trunk/drivers/media/dvb/siano/smsdvb.c
+++ b/trunk/drivers/media/dvb/siano/smsdvb.c
@@ -49,6 +49,9 @@ struct smsdvb_client_t {
 
 	struct completion       tune_done;
 
+	/* todo: save freq/band instead whole struct */
+	struct dtv_frontend_properties fe_params;
+
 	struct SMSHOSTLIB_STATISTICS_DVB_S sms_stat_dvb;
 	int event_fe_state;
 	int event_unc_state;
@@ -741,124 +744,12 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe)
 	struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
 	struct smsdvb_client_t *client =
 		container_of(fe, struct smsdvb_client_t, frontend);
-	struct smscore_device_t *coredev = client->coredev;
-	struct TRANSMISSION_STATISTICS_S *td =
-		&client->sms_stat_dvb.TransmissionData;
-
-	switch (smscore_get_device_mode(coredev)) {
-	case DEVICE_MODE_DVBT:
-	case DEVICE_MODE_DVBT_BDA:
-		fep->frequency = td->Frequency;
-
-		switch (td->Bandwidth) {
-		case 6:
-			fep->bandwidth_hz = 6000000;
-			break;
-		case 7:
-			fep->bandwidth_hz = 7000000;
-			break;
-		case 8:
-			fep->bandwidth_hz = 8000000;
-			break;
-		}
-
-		switch (td->TransmissionMode) {
-		case 2:
-			fep->transmission_mode = TRANSMISSION_MODE_2K;
-			break;
-		case 8:
-			fep->transmission_mode = TRANSMISSION_MODE_8K;
-		}
-
-		switch (td->GuardInterval) {
-		case 0:
-			fep->guard_interval = GUARD_INTERVAL_1_32;
-			break;
-		case 1:
-			fep->guard_interval = GUARD_INTERVAL_1_16;
-			break;
-		case 2:
-			fep->guard_interval = GUARD_INTERVAL_1_8;
-			break;
-		case 3:
-			fep->guard_interval = GUARD_INTERVAL_1_4;
-			break;
-		}
-
-		switch (td->CodeRate) {
-		case 0:
-			fep->code_rate_HP = FEC_1_2;
-			break;
-		case 1:
-			fep->code_rate_HP = FEC_2_3;
-			break;
-		case 2:
-			fep->code_rate_HP = FEC_3_4;
-			break;
-		case 3:
-			fep->code_rate_HP = FEC_5_6;
-			break;
-		case 4:
-			fep->code_rate_HP = FEC_7_8;
-			break;
-		}
-
-		switch (td->LPCodeRate) {
-		case 0:
-			fep->code_rate_LP = FEC_1_2;
-			break;
-		case 1:
-			fep->code_rate_LP = FEC_2_3;
-			break;
-		case 2:
-			fep->code_rate_LP = FEC_3_4;
-			break;
-		case 3:
-			fep->code_rate_LP = FEC_5_6;
-			break;
-		case 4:
-			fep->code_rate_LP = FEC_7_8;
-			break;
-		}
-
-		switch (td->Constellation) {
-		case 0:
-			fep->modulation = QPSK;
-			break;
-		case 1:
-			fep->modulation = QAM_16;
-			break;
-		case 2:
-			fep->modulation = QAM_64;
-			break;
-		}
 
-		switch (td->Hierarchy) {
-		case 0:
-			fep->hierarchy = HIERARCHY_NONE;
-			break;
-		case 1:
-			fep->hierarchy = HIERARCHY_1;
-			break;
-		case 2:
-			fep->hierarchy = HIERARCHY_2;
-			break;
-		case 3:
-			fep->hierarchy = HIERARCHY_4;
-			break;
-		}
+	sms_debug("");
 
-		fep->inversion = INVERSION_AUTO;
-		break;
-	case DEVICE_MODE_ISDBT:
-	case DEVICE_MODE_ISDBT_BDA:
-		fep->frequency = td->Frequency;
-		fep->bandwidth_hz = 6000000;
-		/* todo: retrive the other parameters */
-		break;
-	default:
-		return -EINVAL;
-	}
+	/* todo: */
+	memcpy(fep, &client->fe_params,
+	       sizeof(struct dtv_frontend_properties));
 
 	return 0;
 }
@@ -981,11 +872,11 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
 	switch (smscore_get_device_mode(coredev)) {
 	case DEVICE_MODE_DVBT:
 	case DEVICE_MODE_DVBT_BDA:
-		client->frontend.ops.delsys[0] = SYS_DVBT;
+		smsdvb_fe_ops.delsys[0] = SYS_DVBT;
 		break;
 	case DEVICE_MODE_ISDBT:
 	case DEVICE_MODE_ISDBT_BDA:
-		client->frontend.ops.delsys[0] = SYS_ISDBT;
+		smsdvb_fe_ops.delsys[0] = SYS_ISDBT;
 		break;
 	}
 
diff --git a/trunk/drivers/media/radio/wl128x/Kconfig b/trunk/drivers/media/radio/wl128x/Kconfig
index ea1e6545df36..86b28579f0c7 100644
--- a/trunk/drivers/media/radio/wl128x/Kconfig
+++ b/trunk/drivers/media/radio/wl128x/Kconfig
@@ -4,8 +4,8 @@
 menu "Texas Instruments WL128x FM driver (ST based)"
 config RADIO_WL128X
 	tristate "Texas Instruments WL128x FM Radio"
-	depends on VIDEO_V4L2 && RFKILL && GPIOLIB
-	select TI_ST if NET
+	depends on VIDEO_V4L2 && RFKILL
+	select TI_ST if NET && GPIOLIB
 	help
 	Choose Y here if you have this FM radio chip.
 
diff --git a/trunk/drivers/media/rc/imon.c b/trunk/drivers/media/rc/imon.c
index 3f175ebe2766..6ed96465137a 100644
--- a/trunk/drivers/media/rc/imon.c
+++ b/trunk/drivers/media/rc/imon.c
@@ -47,7 +47,7 @@
 #define MOD_AUTHOR	"Jarod Wilson <jarod@wilsonet.com>"
 #define MOD_DESC	"Driver for SoundGraph iMON MultiMedia IR/Display"
 #define MOD_NAME	"imon"
-#define MOD_VERSION	"0.9.4"
+#define MOD_VERSION	"0.9.3"
 
 #define DISPLAY_MINOR_BASE	144
 #define DEVICE_NAME	"lcd%d"
@@ -1658,17 +1658,9 @@ static void usb_rx_callback_intf0(struct urb *urb)
 		return;
 
 	ictx = (struct imon_context *)urb->context;
-	if (!ictx)
+	if (!ictx || !ictx->dev_present_intf0)
 		return;
 
-	/*
-	 * if we get a callback before we're done configuring the hardware, we
-	 * can't yet process the data, as there's nowhere to send it, but we
-	 * still need to submit a new rx URB to avoid wedging the hardware
-	 */
-	if (!ictx->dev_present_intf0)
-		goto out;
-
 	switch (urb->status) {
 	case -ENOENT:		/* usbcore unlink successful! */
 		return;
@@ -1686,7 +1678,6 @@ static void usb_rx_callback_intf0(struct urb *urb)
 		break;
 	}
 
-out:
 	usb_submit_urb(ictx->rx_urb_intf0, GFP_ATOMIC);
 }
 
@@ -1699,17 +1690,9 @@ static void usb_rx_callback_intf1(struct urb *urb)
 		return;
 
 	ictx = (struct imon_context *)urb->context;
-	if (!ictx)
+	if (!ictx || !ictx->dev_present_intf1)
 		return;
 
-	/*
-	 * if we get a callback before we're done configuring the hardware, we
-	 * can't yet process the data, as there's nowhere to send it, but we
-	 * still need to submit a new rx URB to avoid wedging the hardware
-	 */
-	if (!ictx->dev_present_intf1)
-		goto out;
-
 	switch (urb->status) {
 	case -ENOENT:		/* usbcore unlink successful! */
 		return;
@@ -1727,7 +1710,6 @@ static void usb_rx_callback_intf1(struct urb *urb)
 		break;
 	}
 
-out:
 	usb_submit_urb(ictx->rx_urb_intf1, GFP_ATOMIC);
 }
 
@@ -2260,7 +2242,7 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf,
 	mutex_unlock(&ictx->lock);
 	usb_free_urb(rx_urb);
 rx_urb_alloc_failed:
-	dev_err(ictx->dev, "unable to initialize intf1, err %d\n", ret);
+	dev_err(ictx->dev, "unable to initialize intf0, err %d\n", ret);
 
 	return NULL;
 }
diff --git a/trunk/drivers/media/video/atmel-isi.c b/trunk/drivers/media/video/atmel-isi.c
index ec3f6a06f9c3..9fe4519176a4 100644
--- a/trunk/drivers/media/video/atmel-isi.c
+++ b/trunk/drivers/media/video/atmel-isi.c
@@ -922,9 +922,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
 			isi->fb_descriptors_phys);
 
 	iounmap(isi->regs);
-	clk_unprepare(isi->mck);
 	clk_put(isi->mck);
-	clk_unprepare(isi->pclk);
 	clk_put(isi->pclk);
 	kfree(isi);
 
@@ -957,10 +955,6 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
 	if (IS_ERR(pclk))
 		return PTR_ERR(pclk);
 
-	ret = clk_prepare(pclk);
-	if (ret)
-		goto err_clk_prepare_pclk;
-
 	isi = kzalloc(sizeof(struct atmel_isi), GFP_KERNEL);
 	if (!isi) {
 		ret = -ENOMEM;
@@ -984,10 +978,6 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
 		goto err_clk_get;
 	}
 
-	ret = clk_prepare(isi->mck);
-	if (ret)
-		goto err_clk_prepare_mck;
-
 	/* Set ISI_MCK's frequency, it should be faster than pixel clock */
 	ret = clk_set_rate(isi->mck, pdata->mck_hz);
 	if (ret < 0)
@@ -1069,14 +1059,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
 			isi->fb_descriptors_phys);
 err_alloc_descriptors:
 err_set_mck_rate:
-	clk_unprepare(isi->mck);
-err_clk_prepare_mck:
 	clk_put(isi->mck);
 err_clk_get:
 	kfree(isi);
 err_alloc_isi:
-	clk_unprepare(pclk);
-err_clk_prepare_pclk:
 	clk_put(pclk);
 
 	return ret;
diff --git a/trunk/drivers/media/video/davinci/isif.c b/trunk/drivers/media/video/davinci/isif.c
index 5278fe7d6d0c..1e63852374be 100644
--- a/trunk/drivers/media/video/davinci/isif.c
+++ b/trunk/drivers/media/video/davinci/isif.c
@@ -34,7 +34,6 @@
 #include <linux/videodev2.h>
 #include <linux/clk.h>
 #include <linux/err.h>
-#include <linux/module.h>
 
 #include <mach/mux.h>
 
diff --git a/trunk/drivers/media/video/em28xx/em28xx-dvb.c b/trunk/drivers/media/video/em28xx/em28xx-dvb.c
index aabbf4854f66..9449423098e0 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-dvb.c
@@ -853,7 +853,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
 	case EM28174_BOARD_PCTV_290E:
 		dvb->fe[0] = dvb_attach(cxd2820r_attach,
 					&em28xx_cxd2820r_config,
-					&dev->i2c_adap);
+					&dev->i2c_adap,
+					NULL);
 		if (dvb->fe[0]) {
 			/* FE 0 attach tuner */
 			if (!dvb_attach(tda18271_attach,
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-core.c b/trunk/drivers/media/video/hdpvr/hdpvr-core.c
index 687282d87491..441dacf642bb 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/trunk/drivers/media/video/hdpvr/hdpvr-core.c
@@ -154,20 +154,10 @@ static int device_authorization(struct hdpvr_device *dev)
 	}
 #endif
 
-	dev->fw_ver = dev->usbc_buf[1];
-
 	v4l2_info(&dev->v4l2_dev, "firmware version 0x%x dated %s\n",
-			  dev->fw_ver, &dev->usbc_buf[2]);
-
-	if (dev->fw_ver > 0x15) {
-		dev->options.brightness	= 0x80;
-		dev->options.contrast	= 0x40;
-		dev->options.hue	= 0xf;
-		dev->options.saturation	= 0x40;
-		dev->options.sharpness	= 0x80;
-	}
+			  dev->usbc_buf[1], &dev->usbc_buf[2]);
 
-	switch (dev->fw_ver) {
+	switch (dev->usbc_buf[1]) {
 	case HDPVR_FIRMWARE_VERSION:
 		dev->flags &= ~HDPVR_FLAG_AC3_CAP;
 		break;
@@ -179,7 +169,7 @@ static int device_authorization(struct hdpvr_device *dev)
 	default:
 		v4l2_info(&dev->v4l2_dev, "untested firmware, the driver might"
 			  " not work.\n");
-		if (dev->fw_ver >= HDPVR_FIRMWARE_VERSION_AC3)
+		if (dev->usbc_buf[1] >= HDPVR_FIRMWARE_VERSION_AC3)
 			dev->flags |= HDPVR_FLAG_AC3_CAP;
 		else
 			dev->flags &= ~HDPVR_FLAG_AC3_CAP;
@@ -280,8 +270,6 @@ static const struct hdpvr_options hdpvr_default_options = {
 	.bitrate_mode	= HDPVR_CONSTANT,
 	.gop_mode	= HDPVR_SIMPLE_IDR_GOP,
 	.audio_codec	= V4L2_MPEG_AUDIO_ENCODING_AAC,
-	/* original picture controls for firmware version <= 0x15 */
-	/* updated in device_authorization() for newer firmware */
 	.brightness	= 0x86,
 	.contrast	= 0x80,
 	.hue		= 0x80,
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr-video.c b/trunk/drivers/media/video/hdpvr/hdpvr-video.c
index 11ffe9cc1780..087f7c08cb85 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/trunk/drivers/media/video/hdpvr/hdpvr-video.c
@@ -283,13 +283,12 @@ static int hdpvr_start_streaming(struct hdpvr_device *dev)
 
 		hdpvr_config_call(dev, CTRL_START_STREAMING_VALUE, 0x00);
 
-		dev->status = STATUS_STREAMING;
-
 		INIT_WORK(&dev->worker, hdpvr_transmit_buffers);
 		queue_work(dev->workqueue, &dev->worker);
 
 		v4l2_dbg(MSG_BUFFER, hdpvr_debug, &dev->v4l2_dev,
 			 "streaming started\n");
+		dev->status = STATUS_STREAMING;
 
 		return 0;
 	}
@@ -723,39 +722,21 @@ static const s32 supported_v4l2_ctrls[] = {
 };
 
 static int fill_queryctrl(struct hdpvr_options *opt, struct v4l2_queryctrl *qc,
-			  int ac3, int fw_ver)
+			  int ac3)
 {
 	int err;
 
-	if (fw_ver > 0x15) {
-		switch (qc->id) {
-		case V4L2_CID_BRIGHTNESS:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-		case V4L2_CID_CONTRAST:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x40);
-		case V4L2_CID_SATURATION:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x40);
-		case V4L2_CID_HUE:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0x1e, 1, 0xf);
-		case V4L2_CID_SHARPNESS:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-		}
-	} else {
-		switch (qc->id) {
-		case V4L2_CID_BRIGHTNESS:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x86);
-		case V4L2_CID_CONTRAST:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-		case V4L2_CID_SATURATION:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-		case V4L2_CID_HUE:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-		case V4L2_CID_SHARPNESS:
-			return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
-		}
-	}
-
 	switch (qc->id) {
+	case V4L2_CID_BRIGHTNESS:
+		return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x86);
+	case V4L2_CID_CONTRAST:
+		return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+	case V4L2_CID_SATURATION:
+		return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+	case V4L2_CID_HUE:
+		return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
+	case V4L2_CID_SHARPNESS:
+		return v4l2_ctrl_query_fill(qc, 0x0, 0xff, 1, 0x80);
 	case V4L2_CID_MPEG_AUDIO_ENCODING:
 		return v4l2_ctrl_query_fill(
 			qc, V4L2_MPEG_AUDIO_ENCODING_AAC,
@@ -813,8 +794,7 @@ static int vidioc_queryctrl(struct file *file, void *private_data,
 
 		if (qc->id == supported_v4l2_ctrls[i])
 			return fill_queryctrl(&dev->options, qc,
-					      dev->flags & HDPVR_FLAG_AC3_CAP,
-					      dev->fw_ver);
+					      dev->flags & HDPVR_FLAG_AC3_CAP);
 
 		if (qc->id < supported_v4l2_ctrls[i])
 			break;
diff --git a/trunk/drivers/media/video/hdpvr/hdpvr.h b/trunk/drivers/media/video/hdpvr/hdpvr.h
index fea3c6926997..d6439db1d18b 100644
--- a/trunk/drivers/media/video/hdpvr/hdpvr.h
+++ b/trunk/drivers/media/video/hdpvr/hdpvr.h
@@ -113,7 +113,6 @@ struct hdpvr_device {
 	/* usb control transfer buffer and lock */
 	struct mutex		usbc_mutex;
 	u8			*usbc_buf;
-	u8			fw_ver;
 };
 
 static inline struct hdpvr_device *to_hdpvr_dev(struct v4l2_device *v4l2_dev)
diff --git a/trunk/drivers/media/video/omap3isp/ispccdc.c b/trunk/drivers/media/video/omap3isp/ispccdc.c
index ec62d11d678b..3663834ca94c 100644
--- a/trunk/drivers/media/video/omap3isp/ispccdc.c
+++ b/trunk/drivers/media/video/omap3isp/ispccdc.c
@@ -1407,7 +1407,7 @@ static int __ccdc_handle_stopping(struct isp_ccdc_device *ccdc, u32 event)
 static void ccdc_hs_vs_isr(struct isp_ccdc_device *ccdc)
 {
 	struct isp_pipeline *pipe = to_isp_pipeline(&ccdc->subdev.entity);
-	struct video_device *vdev = ccdc->subdev.devnode;
+	struct video_device *vdev = &ccdc->subdev.devnode;
 	struct v4l2_event event;
 
 	memset(&event, 0, sizeof(event));
diff --git a/trunk/drivers/media/video/uvc/uvc_video.c b/trunk/drivers/media/video/uvc/uvc_video.c
index 4a44f9a1bae0..c7e69b8f81c9 100644
--- a/trunk/drivers/media/video/uvc/uvc_video.c
+++ b/trunk/drivers/media/video/uvc/uvc_video.c
@@ -611,11 +611,9 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
 	delta_stc = buf->pts - (1UL << 31);
 	x1 = first->dev_stc - delta_stc;
 	x2 = last->dev_stc - delta_stc;
-	if (x1 == x2)
-		goto done;
-
 	y1 = (first->dev_sof + 2048) << 16;
 	y2 = (last->dev_sof + 2048) << 16;
+
 	if (y2 < y1)
 		y2 += 2048 << 16;
 
@@ -633,17 +631,15 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
 		  x1, x2, y1, y2, clock->sof_offset);
 
 	/* Second step, SOF to host clock conversion. */
+	ts = timespec_sub(last->host_ts, first->host_ts);
 	x1 = (uvc_video_clock_host_sof(first) + 2048) << 16;
 	x2 = (uvc_video_clock_host_sof(last) + 2048) << 16;
-	if (x2 < x1)
-		x2 += 2048 << 16;
-	if (x1 == x2)
-		goto done;
-
-	ts = timespec_sub(last->host_ts, first->host_ts);
 	y1 = NSEC_PER_SEC;
 	y2 = (ts.tv_sec + 1) * NSEC_PER_SEC + ts.tv_nsec;
 
+	if (x2 < x1)
+		x2 += 2048 << 16;
+
 	/* Interpolated and host SOF timestamps can wrap around at slightly
 	 * different times. Handle this by adding or removing 2048 to or from
 	 * the computed SOF value to keep it close to the SOF samples mean