summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorPeter Rosin <peda@axentia.se>2017-04-03 09:35:31 +0200
committerPeter Rosin <peda@axentia.se>2017-04-19 12:49:29 +0200
commitf6cfec891622f7bc3fb04170b7d7cb8bfebc82a7 (patch)
treec7bd9e96d99e569afba910a9f505d6c846b3c8ca /drivers/media
parentdbed8a803bd3fb64339a6180adaff2cec46242ce (diff)
downloadlinux-f6cfec891622f7bc3fb04170b7d7cb8bfebc82a7.tar.bz2
[media] cx231xx: stop double error reporting
i2c_mux_add_adapter already logs a message on failure. Reviewed-by: Wolfram Sang <wsa@the-dreams.de> Reviewed-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by: Peter Rosin <peda@axentia.se>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-i2c.c15
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)