From 29c0697668f705b6d257a203d7ff104d70fa67cb Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@chromium.org>
Date: Tue, 18 Oct 2016 15:11:32 -0700
Subject: [PATCH] UPSTREAM: drivers/i2c/generic: Return correct name for
 acpi_name

Return config->name if it is not NULL.

BUG=chrome-os-partner:55988
BRANCH=None
TEST=None

Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/17077
Tested-by: build bot (Jenkins)
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>

Change-Id: I9ae229949b73de6f991383daae8d962d6cf457a7
Reviewed-on: https://chromium-review.googlesource.com/402379
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/drivers/i2c/generic/generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drivers/i2c/generic/generic.c b/src/drivers/i2c/generic/generic.c
index 30a280bcff..c11a889d5b 100644
--- a/src/drivers/i2c/generic/generic.c
+++ b/src/drivers/i2c/generic/generic.c
@@ -86,7 +86,7 @@ static const char *i2c_generic_acpi_name(struct device *dev)
 	static char name[5];
 
 	if (config->name)
-		return name;
+		return config->name;
 
 	snprintf(name, sizeof(name), "D%03.3X", dev->path.i2c.device);
 	name[4] = '\0';