Skip to content

Commit

Permalink
Merge tag 'i2c-mux/for-4.12-2' of https://github.com/peda-r/i2c-mux i…
Browse files Browse the repository at this point in the history
…nto 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..."
  • Loading branch information
Wolfram Sang committed Apr 19, 2017
2 parents c99a30d + f6cfec8 commit 2a03d49
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions drivers/media/usb/cx231xx/cx231xx-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2a03d49

Please sign in to comment.