diff --git a/[refs] b/[refs] index aa5f29e04c59..edfd2e7e3ddd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71546300c8684eb69286604c79624582c16f2f5b +refs/heads/master: a205e63d12716bd871b6a5746b6b624c5965a059 diff --git a/trunk/drivers/i2c/muxes/i2c-mux-pca954x.c b/trunk/drivers/i2c/muxes/i2c-mux-pca954x.c index 8e4387235b69..a531d801dbe4 100644 --- a/trunk/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/trunk/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -262,13 +262,11 @@ static int pca954x_remove(struct i2c_client *client) { struct pca954x *data = i2c_get_clientdata(client); const struct chip_desc *chip = &chips[data->type]; - int i, err; + int i; for (i = 0; i < chip->nchans; ++i) if (data->virt_adaps[i]) { - err = i2c_del_mux_adapter(data->virt_adaps[i]); - if (err) - return err; + i2c_del_mux_adapter(data->virt_adaps[i]); data->virt_adaps[i] = NULL; }