Skip to content

Commit

Permalink
[media] az6007: Use a per device private struct
Browse files Browse the repository at this point in the history
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Jan 21, 2012
1 parent 781dacc commit 978c26c
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/media/dvb/dvb-usb/az6007.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)
if (!adap)
return -EINVAL;

st = adap->priv;
st = adap->dev->priv;

if (!st)
return -EINVAL;
Expand Down Expand Up @@ -288,7 +288,7 @@ static int az6007_led_on_off(struct usb_interface *intf, int onoff)

static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
{
struct az6007_device_state *st = adap->priv;
struct az6007_device_state *st = adap->dev->priv;

BUG_ON(!st);

Expand All @@ -311,7 +311,7 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)

static int az6007_tuner_attach(struct dvb_usb_adapter *adap)
{
struct az6007_device_state *st = adap->priv;
struct az6007_device_state *st = adap->dev->priv;

if (st->tuner_attached)
return 0;
Expand Down Expand Up @@ -516,8 +516,8 @@ static struct dvb_usb_device_properties az6007_properties = {
.usb_ctrl = CYPRESS_FX2,
.firmware = "dvb-usb-terratec-h7-az6007.fw",
.no_reconnect = 1,

.identify_state = az6007_identify_state,
.size_of_priv = sizeof(struct az6007_device_state),
.identify_state = az6007_identify_state,
.num_adapters = 1,
.adapter = {
{
Expand All @@ -538,7 +538,6 @@ static struct dvb_usb_device_properties az6007_properties = {
}
}
},
.size_of_priv = sizeof(struct az6007_device_state),
}}
} },
.power_ctrl = az6007_power_ctrl,
Expand Down

0 comments on commit 978c26c

Please sign in to comment.