From a7e925027ff3b2fe7530ca886939bbeea7c906b7 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 22 Jun 2018 10:15:04 -0700 Subject: drivers/i2c/sx9310: Check for config not being NULL before using it This change fixes the issue reported by Coverity CID 1393576 to ensure that config is checked for NULL before it is actually used. Change-Id: I5f0cd2bf2437fc640f4cf8d8203a971daf1f8d17 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/27207 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Enrico Granata Reviewed-by: Patrick Georgi Reviewed-by: Paul Menzel --- src/drivers/i2c/sx9310/sx9310.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c index 7da87c480a..5f63734c9b 100644 --- a/src/drivers/i2c/sx9310/sx9310.c +++ b/src/drivers/i2c/sx9310/sx9310.c @@ -36,7 +36,7 @@ static void i2c_sx9310_fill_ssdt(struct device *dev) struct acpi_i2c i2c = { .address = dev->path.i2c.device, .mode_10bit = dev->path.i2c.mode_10bit, - .speed = config->speed ? : I2C_SPEED_FAST, + .speed = I2C_SPEED_FAST, .resource = scope, }; struct acpi_dp *dsd; @@ -44,6 +44,9 @@ static void i2c_sx9310_fill_ssdt(struct device *dev) if (!dev->enabled || !scope || !config) return; + if (config->speed) + i2c.speed = config->speed; + /* Device */ acpigen_write_scope(scope); acpigen_write_device(acpi_device_name(dev)); -- cgit v1.2.3