diff options
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-dvb.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-dvb.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c index 3d70af283881..5958cb882e93 100644 --- a/drivers/media/video/cx23885/cx23885-dvb.c +++ b/drivers/media/video/cx23885/cx23885-dvb.c | |||
@@ -1017,10 +1017,7 @@ static int dvb_register(struct cx23885_tsport *port) | |||
1017 | /* Read entire EEPROM */ | 1017 | /* Read entire EEPROM */ |
1018 | dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1; | 1018 | dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1; |
1019 | tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom, sizeof(eeprom)); | 1019 | tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom, sizeof(eeprom)); |
1020 | printk(KERN_INFO "TeVii S470 MAC= " | 1020 | printk(KERN_INFO "TeVii S470 MAC= %pM\n", eeprom + 0xa0); |
1021 | "%02X:%02X:%02X:%02X:%02X:%02X\n", | ||
1022 | eeprom[0xa0], eeprom[0xa1], eeprom[0xa2], | ||
1023 | eeprom[0xa3], eeprom[0xa4], eeprom[0xa5]); | ||
1024 | memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6); | 1021 | memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6); |
1025 | break; | 1022 | break; |
1026 | } | 1023 | } |
@@ -1074,7 +1071,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port) | |||
1074 | videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops, | 1071 | videobuf_queue_sg_init(&fe0->dvb.dvbq, &dvb_qops, |
1075 | &dev->pci->dev, &port->slock, | 1072 | &dev->pci->dev, &port->slock, |
1076 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP, | 1073 | V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_TOP, |
1077 | sizeof(struct cx23885_buffer), port); | 1074 | sizeof(struct cx23885_buffer), port, NULL); |
1078 | } | 1075 | } |
1079 | err = dvb_register(port); | 1076 | err = dvb_register(port); |
1080 | if (err != 0) | 1077 | if (err != 0) |