diff options
Diffstat (limited to 'drivers/media/dvb/dibusb/dvb-dibusb-dvb.c')
-rw-r--r-- | drivers/media/dvb/dibusb/dvb-dibusb-dvb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c b/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c index 04e54ec093f0..400b439e804e 100644 --- a/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c +++ b/drivers/media/dvb/dibusb/dvb-dibusb-dvb.c | |||
@@ -131,7 +131,7 @@ int dibusb_dvb_init(struct usb_dibusb *dib) | |||
131 | deb_info("dvb_register_adapter failed: error %d", ret); | 131 | deb_info("dvb_register_adapter failed: error %d", ret); |
132 | goto err; | 132 | goto err; |
133 | } | 133 | } |
134 | dib->adapter->priv = dib; | 134 | dib->adapter.priv = dib; |
135 | 135 | ||
136 | /* i2c is done in dibusb_i2c_init */ | 136 | /* i2c is done in dibusb_i2c_init */ |
137 | 137 | ||
@@ -151,18 +151,18 @@ int dibusb_dvb_init(struct usb_dibusb *dib) | |||
151 | dib->dmxdev.filternum = dib->demux.filternum; | 151 | dib->dmxdev.filternum = dib->demux.filternum; |
152 | dib->dmxdev.demux = &dib->demux.dmx; | 152 | dib->dmxdev.demux = &dib->demux.dmx; |
153 | dib->dmxdev.capabilities = 0; | 153 | dib->dmxdev.capabilities = 0; |
154 | if ((ret = dvb_dmxdev_init(&dib->dmxdev, dib->adapter)) < 0) { | 154 | if ((ret = dvb_dmxdev_init(&dib->dmxdev, &dib->adapter)) < 0) { |
155 | err("dvb_dmxdev_init failed: error %d",ret); | 155 | err("dvb_dmxdev_init failed: error %d",ret); |
156 | goto err_dmx_dev; | 156 | goto err_dmx_dev; |
157 | } | 157 | } |
158 | 158 | ||
159 | dvb_net_init(dib->adapter, &dib->dvb_net, &dib->demux.dmx); | 159 | dvb_net_init(&dib->adapter, &dib->dvb_net, &dib->demux.dmx); |
160 | 160 | ||
161 | goto success; | 161 | goto success; |
162 | err_dmx_dev: | 162 | err_dmx_dev: |
163 | dvb_dmx_release(&dib->demux); | 163 | dvb_dmx_release(&dib->demux); |
164 | err_dmx: | 164 | err_dmx: |
165 | dvb_unregister_adapter(dib->adapter); | 165 | dvb_unregister_adapter(&dib->adapter); |
166 | err: | 166 | err: |
167 | return ret; | 167 | return ret; |
168 | success: | 168 | success: |
@@ -179,7 +179,7 @@ int dibusb_dvb_exit(struct usb_dibusb *dib) | |||
179 | dib->demux.dmx.close(&dib->demux.dmx); | 179 | dib->demux.dmx.close(&dib->demux.dmx); |
180 | dvb_dmxdev_release(&dib->dmxdev); | 180 | dvb_dmxdev_release(&dib->dmxdev); |
181 | dvb_dmx_release(&dib->demux); | 181 | dvb_dmx_release(&dib->demux); |
182 | dvb_unregister_adapter(dib->adapter); | 182 | dvb_unregister_adapter(&dib->adapter); |
183 | } | 183 | } |
184 | return 0; | 184 | return 0; |
185 | } | 185 | } |