Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 330559
b: refs/heads/master
c: dc78693
h: refs/heads/master
i:
  330557: 887f7bc
  330555: 7c9157d
  330551: 2b682f9
  330543: f2a17bd
  330527: f115d39
  330495: 27f3776
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent a470125 commit 3ee6bd3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c79b339f92921fe73ac32ac2ae49a5b549dfc1f2
refs/heads/master: dc78693706b3efc7e1f7647a35d29736e6d2be3f
3 changes: 3 additions & 0 deletions trunk/drivers/media/dvb/dvb-usb/dvb_usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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 */
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.");

Expand Down

0 comments on commit 3ee6bd3

Please sign in to comment.