From 470f4f11e9f052dc653cba494279bcb0eefa5d51 Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Mon, 18 Jun 2012 19:58:44 -0300
Subject: [PATCH] --- yaml --- r: 330643 b: refs/heads/master c:
 2731d4ed77e3a58cd44584e3741c8f3e30956e9b h: refs/heads/master i:   330641:
 525e910989243b0c23524a0287722f5948a36b65   330639:
 ca1c8a5d5db4154ff2e70e03b15c1e5ec8281759 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/dvb/dvb-usb/ec168.c | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 1aadc992a888..c84b694259a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 232b6968b1296ccd4086867c9890b6f55a65256e
+refs/heads/master: 2731d4ed77e3a58cd44584e3741c8f3e30956e9b
diff --git a/trunk/drivers/media/dvb/dvb-usb/ec168.c b/trunk/drivers/media/dvb/dvb-usb/ec168.c
index 3ed80b01d5fa..c05f09c529e3 100644
--- a/trunk/drivers/media/dvb/dvb-usb/ec168.c
+++ b/trunk/drivers/media/dvb/dvb-usb/ec168.c
@@ -271,7 +271,7 @@ static int ec168_ec100_frontend_attach(struct dvb_usb_adapter *adap)
 {
 	pr_debug("%s:\n", __func__);
 	adap->fe[0] = dvb_attach(ec100_attach, &ec168_ec100_config,
-		&adap->dev->i2c_adap);
+			&adap_to_d(adap)->i2c_adap);
 	if (adap->fe[0] == NULL)
 		return -ENODEV;
 
@@ -299,7 +299,7 @@ static int ec168_mxl5003s_tuner_attach(struct dvb_usb_adapter *adap)
 {
 	pr_debug("%s:\n", __func__);
 	return dvb_attach(mxl5005s_attach, adap->fe[0],
-			&adap->dev->i2c_adap,
+			&adap_to_d(adap)->i2c_adap,
 			&ec168_mxl5003s_config) == NULL ? -ENODEV : 0;
 }
 
@@ -309,7 +309,7 @@ static int ec168_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 	pr_debug("%s: onoff=%d\n", __func__, onoff);
 	if (onoff)
 		req.index = 0x0102;
-	return ec168_ctrl_msg(adap->dev, &req);
+	return ec168_ctrl_msg(adap_to_d(adap), &req);
 }
 
 /* DVB USB Driver stuff */
@@ -333,16 +333,7 @@ static struct dvb_usb_device_properties ec168_props = {
 	.num_adapters = 1,
 	.adapter = {
 		{
-			.stream = {
-				.type = USB_BULK,
-				.count = 6,
-				.endpoint = 0x82,
-				.u = {
-					.bulk = {
-						.buffersize = (32*512),
-					}
-				}
-			},
+			.stream = DVB_USB_STREAM_BULK(0x82, 6, 32 * 512),
 		}
 	},
 };