diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-17 07:51:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-17 07:51:07 +0100 |
| commit | 99f4c9de2b707795acb215e2e94df7ea266042b5 (patch) | |
| tree | 6123682a8e0d880feebb690a55b3fb442ef3dee8 /drivers/net/sfc/sfe4001.c | |
| parent | 62ad33f67003b9a7b6013f0511579b9805e11626 (diff) | |
| parent | 156171c71a0dc4bce12b4408bb1591f8fe32dc1a (diff) | |
| download | kernel_samsung_smdk4412-99f4c9de2b707795acb215e2e94df7ea266042b5.zip kernel_samsung_smdk4412-99f4c9de2b707795acb215e2e94df7ea266042b5.tar.gz kernel_samsung_smdk4412-99f4c9de2b707795acb215e2e94df7ea266042b5.tar.bz2 | |
Merge commit 'v2.6.32-rc7' into core/iommu
Merge reason: Add fixes we'll depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/sfc/sfe4001.c')
| -rw-r--r-- | drivers/net/sfc/sfe4001.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c index cee00ad..49eb91b 100644 --- a/drivers/net/sfc/sfe4001.c +++ b/drivers/net/sfc/sfe4001.c @@ -188,7 +188,7 @@ static int sfn4111t_reset(struct efx_nic *efx) efx_oword_t reg; /* GPIO 3 and the GPIO register are shared with I2C, so block that */ - mutex_lock(&efx->i2c_adap.bus_lock); + i2c_lock_adapter(&efx->i2c_adap); /* Pull RST_N (GPIO 2) low then let it up again, setting the * FLASH_CFG_1 strap (GPIO 3) appropriately. Only change the @@ -204,7 +204,7 @@ static int sfn4111t_reset(struct efx_nic *efx) falcon_write(efx, ®, GPIO_CTL_REG_KER); msleep(1); - mutex_unlock(&efx->i2c_adap.bus_lock); + i2c_unlock_adapter(&efx->i2c_adap); ssleep(1); return 0; |