aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/b2c2/flexcop-eeprom.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/b2c2/flexcop-eeprom.c')
-rw-r--r--drivers/media/dvb/b2c2/flexcop-eeprom.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-eeprom.c b/drivers/media/dvb/b2c2/flexcop-eeprom.c
index 4dbedd819734..bbcf070a178d 100644
--- a/drivers/media/dvb/b2c2/flexcop-eeprom.c
+++ b/drivers/media/dvb/b2c2/flexcop-eeprom.c
@@ -129,8 +129,6 @@ static int flexcop_eeprom_lrc_read(struct flexcop_device *fc, u16 addr, u8 *buf,
129 return ret; 129 return ret;
130} 130}
131 131
132/* TODO how is it handled in USB */
133
134/* JJ's comment about extended == 1: it is not presently used anywhere but was 132/* JJ's comment about extended == 1: it is not presently used anywhere but was
135 * added to the low-level functions for possible support of EUI64 133 * added to the low-level functions for possible support of EUI64
136 */ 134 */
@@ -139,18 +137,16 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended)
139 u8 buf[8]; 137 u8 buf[8];
140 int ret = 0; 138 int ret = 0;
141 139
142 memset(fc->mac_address,0,6);
143
144 if ((ret = flexcop_eeprom_lrc_read(fc,0x3f8,buf,8,4)) == 0) { 140 if ((ret = flexcop_eeprom_lrc_read(fc,0x3f8,buf,8,4)) == 0) {
145 if (extended != 0) { 141 if (extended != 0) {
146 err("TODO: extended (EUI64) MAC addresses aren't completely supported yet"); 142 err("TODO: extended (EUI64) MAC addresses aren't completely supported yet");
147 ret = -EINVAL; 143 ret = -EINVAL;
148/* memcpy(fc->mac_address,buf,3); 144/* memcpy(fc->dvb_adapter.proposed_mac,buf,3);
149 mac[3] = 0xfe; 145 mac[3] = 0xfe;
150 mac[4] = 0xff; 146 mac[4] = 0xff;
151 memcpy(&fc->mac_address[3],&buf[5],3); */ 147 memcpy(&fc->dvb_adapter.proposed_mac[3],&buf[5],3); */
152 } else 148 } else
153 memcpy(fc->mac_address,buf,6); 149 memcpy(fc->dvb_adapter.proposed_mac,buf,6);
154 } 150 }
155 return ret; 151 return ret;
156} 152}