From: Heinrich Schuchardt Date: Tue, 30 Jan 2018 23:57:17 +0000 (+0100) Subject: i2c: mvtwsi.c: Avoid NULL dereference X-Git-Tag: v2018.03-rc2~33^2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8bcf12ccce89ef9c77d9322930445b4f4ca3b822;p=u-boot i2c: mvtwsi.c: Avoid NULL dereference For '#ifndef CONFIG_DM_I2C' twsi_i2c_init() passes NULL as 4th parameter to __twsi_i2c_init(). Identified with cppcheck. Signed-off-by: Heinrich Schuchardt --- diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index dfbc4e053f..30bee0d52e 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -490,7 +490,8 @@ static void __twsi_i2c_init(struct mvtwsi_registers *twsi, int speed, /* Reset controller */ twsi_reset(twsi); /* Set speed */ - *actual_speed = __twsi_i2c_set_bus_speed(twsi, speed); + if (actual_speed) + *actual_speed = __twsi_i2c_set_bus_speed(twsi, speed); /* Set slave address; even though we don't use it */ writel(slaveadd, &twsi->slave_address); writel(0, &twsi->xtnd_slave_addr);