diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:31:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:31:41 -0300 |
| commit | ad3005a5aef389128ae49acebb757b690de6a06c (patch) | |
| tree | adbe97358e6f5d329ca58078ff9d1b166befed70 /linux/drivers/media/dvb/b2c2/flexcop.c | |
| parent | 2006ab389f819c535db3a5215d7feeaf6bceed18 (diff) | |
| parent | 01407df1fca0fa2aa38ce08078b074f16fc83120 (diff) | |
| download | mediapointer-dvb-s2-ad3005a5aef389128ae49acebb757b690de6a06c.tar.gz mediapointer-dvb-s2-ad3005a5aef389128ae49acebb757b690de6a06c.tar.bz2 | |
merge: http://linuxtv.org/hg/~pb/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/b2c2/flexcop.c')
| -rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop.c b/linux/drivers/media/dvb/b2c2/flexcop.c index 2ddafd071..205146c24 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop.c +++ b/linux/drivers/media/dvb/b2c2/flexcop.c @@ -257,6 +257,12 @@ int flexcop_device_initialize(struct flexcop_device *fc) if ((ret = flexcop_dvb_init(fc))) goto error; + /* i2c has to be done before doing EEProm stuff - + * because the EEProm is accessed via i2c */ + ret = flexcop_i2c_init(fc); + if (ret) + goto error; + /* do the MAC address reading after initializing the dvb_adapter */ if (fc->get_mac_addr(fc, 0) == 0) { u8 *b = fc->dvb_adapter.proposed_mac; @@ -266,10 +272,6 @@ int flexcop_device_initialize(struct flexcop_device *fc) } else warn("reading of MAC address failed.\n"); - - if ((ret = flexcop_i2c_init(fc))) - goto error; - if ((ret = flexcop_frontend_init(fc))) goto error; |