On 2016-08-25 18:24, Wolfram Sang wrote: > On Thu, Aug 25, 2016 at 06:22:37PM +0200, Peter Rosin wrote: >> On 2016-08-25 18:19, Wolfram Sang wrote: >>> >>>> diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c >>>> index 3cb8af635db5..f052c3067791 100644 >>>> --- a/drivers/i2c/muxes/i2c-mux-pca9541.c >>>> +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c >>>> @@ -349,7 +349,8 @@ static int pca9541_probe(struct i2c_client *client, >>>> force = 0; >>>> if (pdata) >>>> force = pdata->modes[0].adap_id; >>>> - muxc = i2c_mux_alloc(adap, &client->dev, 1, sizeof(*data), 0, >>>> + muxc = i2c_mux_alloc(adap, &client->dev, 1, sizeof(*data), >>>> + I2C_MUX_ARBITRATOR, >>> >>> Does it make sense to rename the file to i2c-arb-* somewhen then? Just >>> asking, I'll apply the patch anyhow. >> >> There should be a clean branch with /only/ this series that both i2c and >> iio can share, to prevent merge problems. I said I'd make such a branch >> in the i2c-mux repo, but you are of course also welcome to provide that >> branch if you prefer... > > No, this is fine. Send me a pull request and I'll merge. Right, I was waiting for some confirmation if v4.8-rc3 was a good base, but I'm running out of patience... Anyway, I'll send the pull request no later that tomorrow morning (CEST). I assume I can add your ack? Cheers, Peter -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
