Skip to content

Commit

Permalink
[media] dvb_usb_v2: add .init() callback
Browse files Browse the repository at this point in the history
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Aug 4, 2012
1 parent c79b339 commit dc78693
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions 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 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 dc78693

Please sign in to comment.