diff options
| author | Johannes Stezenbach <js@linuxtv.org> | 2005-05-16 21:54:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-17 07:59:25 -0700 |
| commit | 778241313819e17de3bdf91523c724b4704402c6 (patch) | |
| tree | b0638104fbf6de5a6bfec9ed28d55c33f43e3320 /drivers/media/dvb/b2c2/flexcop.c | |
| parent | 3ed8a31cb387b2ae3e4ca508f973931b61e6f6bd (diff) | |
| download | blackbird-obmc-linux-778241313819e17de3bdf91523c724b4704402c6.tar.gz blackbird-obmc-linux-778241313819e17de3bdf91523c724b4704402c6.zip | |
[PATCH] dvb: flexcop: fix MAC address reading
read MAC address directly into dvb_adapter->proposed_mac
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/b2c2/flexcop.c')
| -rw-r--r-- | drivers/media/dvb/b2c2/flexcop.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c index 1998267207fb..ad590875064b 100644 --- a/drivers/media/dvb/b2c2/flexcop.c +++ b/drivers/media/dvb/b2c2/flexcop.c @@ -233,16 +233,18 @@ int flexcop_device_initialize(struct flexcop_device *fc) flexcop_smc_ctrl(fc, 0); + if ((ret = flexcop_dvb_init(fc))) + goto error; + + /* do the MAC address reading after initializing the dvb_adapter */ if (fc->get_mac_addr(fc, 0) == 0) { - u8 *b = fc->mac_address; + u8 *b = fc->dvb_adapter.proposed_mac; info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]); - flexcop_set_mac_filter(fc,fc->mac_address); + flexcop_set_mac_filter(fc,b); flexcop_mac_filter_ctrl(fc,1); } else warn("reading of MAC address failed.\n"); - if ((ret = flexcop_dvb_init(fc))) - goto error; if ((ret = flexcop_i2c_init(fc))) goto error; |
