projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
[linux-2.6-block.git]
/
drivers
/
i2c
/
busses
/
i2c-cadence.c
diff --git
a/drivers/i2c/busses/i2c-cadence.c
b/drivers/i2c/busses/i2c-cadence.c
index 3c16a2f7c673cb808b4113a65d41493bd167ca89..686971263bef19a2fcc159432a6e6e46b1e16771 100644
(file)
--- a/
drivers/i2c/busses/i2c-cadence.c
+++ b/
drivers/i2c/busses/i2c-cadence.c
@@
-963,10
+963,8
@@
static int cdns_i2c_probe(struct platform_device *pdev)
}
ret = i2c_add_adapter(&id->adap);
- if (ret < 0) {
- dev_err(&pdev->dev, "reg adap failed: %d\n", ret);
+ if (ret < 0)
goto err_clk_dis;
- }
/*
* Cadence I2C controller has a bug wherein it generates