Merge branch 'sched/urgent' into sched/core

Merge reason: Pick up fixes that did not make it into .32.0

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c
index cee00ad49b57..49eb91b5f50c 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, &reg, GPIO_CTL_REG_KER);
         msleep(1);
 
-        mutex_unlock(&efx->i2c_adap.bus_lock);
+        i2c_unlock_adapter(&efx->i2c_adap);
 
         ssleep(1);
         return 0;