Merge tag 'i2c-mux/for-4.12-2' of https://github.com/peda-r/i2c-mux into i2c/for-4.12
Pull in trivial change from the i2c-mux subsubsystem: "I thought Mauro would take this patch, but then he just added a tag. So, here's a late incremental pull request for v4.12-rc1..."
This commit is contained in:
commit
2a03d49922
|
@ -576,17 +576,10 @@ int cx231xx_i2c_mux_create(struct cx231xx *dev)
|
|||
|
||||
int cx231xx_i2c_mux_register(struct cx231xx *dev, int mux_no)
|
||||
{
|
||||
int rc;
|
||||
|
||||
rc = i2c_mux_add_adapter(dev->muxc,
|
||||
0,
|
||||
mux_no /* chan_id */,
|
||||
0 /* class */);
|
||||
if (rc)
|
||||
dev_warn(dev->dev,
|
||||
"i2c mux %d register FAILED\n", mux_no);
|
||||
|
||||
return rc;
|
||||
return i2c_mux_add_adapter(dev->muxc,
|
||||
0,
|
||||
mux_no /* chan_id */,
|
||||
0 /* class */);
|
||||
}
|
||||
|
||||
void cx231xx_i2c_mux_unregister(struct cx231xx *dev)
|
||||
|
|
Loading…
Reference in New Issue