From 3ee6bd3fdd4bf9dd756a501a823240b303ab089f Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Wed, 23 May 2012 10:44:15 -0300
Subject: [PATCH] --- yaml --- r: 330559 b: refs/heads/master c:
 dc78693706b3efc7e1f7647a35d29736e6d2be3f h: refs/heads/master i:   330557:
 887f7bc3fe6966939c99613906d18e640a67a54e   330555:
 7c9157df09cb1d5b16094a0ace4bed6021935953   330551:
 2b682f9053feec6cbe3865a5b5192a6506f8c1cb   330543:
 f2a17bd912ac88ab5427886f4cd91157cfcb766a   330527:
 f115d391e972cf6db50e83c264edfab95a97a24e   330495:
 27f37769c9cb46b1f9f0db4022d645497a670e5a v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/dvb/dvb-usb/dvb_usb.h      | 3 +++
 trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c1ca0d91949b..c4d080396e85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c79b339f92921fe73ac32ac2ae49a5b549dfc1f2
+refs/heads/master: dc78693706b3efc7e1f7647a35d29736e6d2be3f
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
index 95caac116e8e..15b08b777e6d 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
@@ -239,6 +239,8 @@ enum dvb_usb_mode {
  * @read_mac_address: called to read the MAC address of the device.
  * @identify_state: called to determine the state (cold or warm), when it
  *  is not distinguishable by the USB IDs.
+ * @init: called after adapters are created in order to finalize device
+ *  configuration.
  *
  * @rc: remote controller properties
  *
@@ -283,6 +285,7 @@ struct dvb_usb_device_properties {
 	int (*read_mac_address) (struct dvb_usb_device *, u8 []);
 	int (*identify_state)   (struct usb_device *, struct dvb_usb_device_properties *,
 			struct dvb_usb_device_description **, int *);
+	int (*init) (struct dvb_usb_device *);
 
 	struct {
 		enum dvb_usb_mode mode;	/* Drivers shouldn't touch on it */
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index 4ae30451eb9e..0d769a1c1807 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -164,6 +164,9 @@ static int dvb_usb_init(struct dvb_usb_device *d, short *adapter_nums)
 		return ret;
 	}
 
+	if (d->props.init)
+		d->props.init(d);
+
 	if ((ret = dvb_usb_remote_init(d)))
 		err("could not initialize remote control.");