diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/vp7045.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/vp7045.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c index 9ac95f54f9fc..0f57abeb6d6b 100644 --- a/drivers/media/dvb/dvb-usb/vp7045.c +++ b/drivers/media/dvb/dvb-usb/vp7045.c | |||
| @@ -164,7 +164,6 @@ static int vp7045_read_eeprom(struct dvb_usb_device *d,u8 *buf, int len, int off | |||
| 164 | return 0; | 164 | return 0; |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | |||
| 168 | static int vp7045_read_mac_addr(struct dvb_usb_device *d,u8 mac[6]) | 167 | static int vp7045_read_mac_addr(struct dvb_usb_device *d,u8 mac[6]) |
| 169 | { | 168 | { |
| 170 | return vp7045_read_eeprom(d,mac, 6, MAC_0_ADDR); | 169 | return vp7045_read_eeprom(d,mac, 6, MAC_0_ADDR); |
| @@ -199,7 +198,7 @@ static struct dvb_usb_properties vp7045_properties; | |||
| 199 | static int vp7045_usb_probe(struct usb_interface *intf, | 198 | static int vp7045_usb_probe(struct usb_interface *intf, |
| 200 | const struct usb_device_id *id) | 199 | const struct usb_device_id *id) |
| 201 | { | 200 | { |
| 202 | return dvb_usb_device_init(intf,&vp7045_properties,THIS_MODULE); | 201 | return dvb_usb_device_init(intf,&vp7045_properties,THIS_MODULE,NULL); |
| 203 | } | 202 | } |
| 204 | 203 | ||
| 205 | static struct usb_device_id vp7045_usb_table [] = { | 204 | static struct usb_device_id vp7045_usb_table [] = { |
| @@ -256,9 +255,9 @@ static struct dvb_usb_properties vp7045_properties = { | |||
| 256 | static struct usb_driver vp7045_usb_driver = { | 255 | static struct usb_driver vp7045_usb_driver = { |
| 257 | .owner = THIS_MODULE, | 256 | .owner = THIS_MODULE, |
| 258 | .name = "dvb_usb_vp7045", | 257 | .name = "dvb_usb_vp7045", |
| 259 | .probe = vp7045_usb_probe, | 258 | .probe = vp7045_usb_probe, |
| 260 | .disconnect = dvb_usb_device_exit, | 259 | .disconnect = dvb_usb_device_exit, |
| 261 | .id_table = vp7045_usb_table, | 260 | .id_table = vp7045_usb_table, |
| 262 | }; | 261 | }; |
| 263 | 262 | ||
| 264 | /* module stuff */ | 263 | /* module stuff */ |
