summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-06-10 13:33:44 -0700
committerPatrick Georgi <pgeorgi@google.com>2018-06-12 11:11:42 +0000
commit24681f188ac868c0bc9b3f1fc55732f0ec6a08fe (patch)
tree2776898aa13170740b7de1df59b445f74d06d03a
parente9147bdf119d843bf15212ef55ed5d2a311c1421 (diff)
drivers/i2c/generic: Ensure config is not NULL before accessing it
This change checks to ensure that config is not NULL before it is accessed for the first time. Reported by: Coverity CID #1393312 Change-Id: Ic248c79783da9c2bfdf3b7f737e5963feff7558c Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/27009 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Naresh Solanki <naresh.solanki@intel.com>
-rw-r--r--src/drivers/i2c/generic/generic.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 7f1ce16fea..1b12df57d3 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -202,6 +202,9 @@ static void i2c_generic_enable(struct device *dev)
{
struct drivers_i2c_generic_config *config = dev->chip_info;
+ if (!config)
+ return;
+
/* Check if device is present by reading GPIO */
if (config->device_present_gpio) {
int present = gpio_get(config->device_present_gpio);
@@ -219,9 +222,8 @@ static void i2c_generic_enable(struct device *dev)
dev->ops = &i2c_generic_ops;
/* Name the device as per description provided in devicetree */
- if (config && config->desc) {
+ if (config->desc)
dev->name = config->desc;
- }
}
struct chip_operations drivers_i2c_generic_ops = {