diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-04-19 21:19:03 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-04-19 21:19:03 +0300 |
| commit | 2a03d49922fa2b89ceaa7d14b657c8a8e6bc7000 (patch) | |
| tree | ab3ac7c5d7f18fdf01647f8a0744a6256c141377 | |
| parent | c99a30d8c4d5e26e69fe3c01c4caf7b6f309e026 (diff) | |
| parent | f6cfec891622f7bc3fb04170b7d7cb8bfebc82a7 (diff) | |
| download | linux-2a03d49922fa2b89ceaa7d14b657c8a8e6bc7000.tar.xz | |
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..."
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-i2c.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c index 35e9acfe63d3..dff514e147da 100644 --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c @@ -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) |