Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / net / ethernet / sfc / falcon.c

diff --git a/drivers/net/ethernet/sfc/falcon.c b/drivers/net/ethernet/sfc/falcon.c
index 4486102fa9b3fd7a06fea65b987f7c6081449c7b..71998e7995d9b3af015653eee2a80f1ec097c3ab 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon.c
+++ b/drivers/net/ethernet/sfc/falcon.c
@@ -1528,7 +1528,7 @@ static int falcon_probe_nic(struct efx_nic *efx)
        return 0;
 
  fail6:
-       BUG_ON(i2c_del_adapter(&board->i2c_adap));
+       i2c_del_adapter(&board->i2c_adap);
        memset(&board->i2c_adap, 0, sizeof(board->i2c_adap));
  fail5:
        efx_nic_free_buffer(efx, &efx->irq_status);
@@ -1666,13 +1666,11 @@ static void falcon_remove_nic(struct efx_nic *efx)
 {
        struct falcon_nic_data *nic_data = efx->nic_data;
        struct falcon_board *board = falcon_board(efx);
-       int rc;
 
        board->type->fini(efx);
 
        /* Remove I2C adapter and clear it in preparation for a retry */
-       rc = i2c_del_adapter(&board->i2c_adap);
-       BUG_ON(rc);
+       i2c_del_adapter(&board->i2c_adap);
        memset(&board->i2c_adap, 0, sizeof(board->i2c_adap));
 
        efx_nic_free_buffer(efx, &efx->irq_status);