diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-03-04 09:53:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-04 17:40:22 -0800 |
| commit | 8c870379d2db81a11ede65e9fd9774e4e6efe84a (patch) | |
| tree | 108e0a64e644c6d33ef7f2b4ea06488d8a2c57c6 /drivers/net/sfc | |
| parent | 115122afc5e34499a0edfd2b057e9c352fa7c78f (diff) | |
| download | op-kernel-dev-8c870379d2db81a11ede65e9fd9774e4e6efe84a.zip op-kernel-dev-8c870379d2db81a11ede65e9fd9774e4e6efe84a.tar.gz | |
sfc: Clear I2C adapter structure in falcon_remove_nic()
i2c_del_adapter() leaves dangling pointers in the structure. If we
retry the NIC probe and pass the structure to i2c_add_adapter() again
it will lead to an oops unless we clear it first.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
| -rw-r--r-- | drivers/net/sfc/falcon.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 9e2f0f0..efd121c 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c @@ -3114,8 +3114,10 @@ void falcon_remove_nic(struct efx_nic *efx) struct falcon_nic_data *nic_data = efx->nic_data; int rc; + /* Remove I2C adapter and clear it in preparation for a retry */ rc = i2c_del_adapter(&efx->i2c_adap); BUG_ON(rc); + memset(&efx->i2c_adap, 0, sizeof(efx->i2c_adap)); falcon_remove_spi_devices(efx); falcon_free_buffer(efx, &efx->irq_status); |
