From f9fbb3edf945726f3042dfebec1900bbf0edae46 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 29 Jul 2016 18:37:56 +0200 Subject: [PATCH] UPSTREAM: intel/skylake: Enable signalling of error condition Testing for "devfn < 0" on an unsigned doesn't work, and i2c_bus_to_devfn returns an int (with -1 for "error"), so use int for devfn. BUG=None BRANCH=None TEST=None Change-Id: Icec29cdb2afab4a69c04660fef32557c4de4c5d7 Signed-off-by: Patrick Georgi Found-by: Coverity Scan #1357450, #1357449 Reviewed-on: https://review.coreboot.org/15964 Reviewed-by: Duncan Laurie Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-on: https://chromium-review.googlesource.com/366274 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Furquan Shaikh --- src/soc/intel/skylake/romstage/i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/skylake/romstage/i2c.c b/src/soc/intel/skylake/romstage/i2c.c index 3d2e9945c0..f6d1384a4b 100644 --- a/src/soc/intel/skylake/romstage/i2c.c +++ b/src/soc/intel/skylake/romstage/i2c.c @@ -27,7 +27,7 @@ uintptr_t lpss_i2c_base_address(unsigned bus) { - unsigned devfn; + int devfn; pci_devfn_t dev; /* Find device+function for this controller */ @@ -49,7 +49,7 @@ static void i2c_early_init_bus(unsigned bus) const struct lpss_i2c_speed_config *sptr; enum i2c_speed speed; pci_devfn_t dev; - unsigned devfn; + int devfn; uintptr_t base; uint32_t value; void *reg;