diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2019-09-20 13:02:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-01 09:01:41 +0200 |
| commit | 0f5df0b76e4fff26da409483297d6ac95a2032ca (patch) | |
| tree | 300d651507aa99405f758174743ceb784bfbde86 /drivers/platform | |
| parent | 811fc53c37be77bfa8272fea12cb519fa8f792f8 (diff) | |
| download | linux-stable-0f5df0b76e4fff26da409483297d6ac95a2032ca.tar.gz linux-stable-0f5df0b76e4fff26da409483297d6ac95a2032ca.tar.bz2 linux-stable-0f5df0b76e4fff26da409483297d6ac95a2032ca.zip | |
platform/x86: i2c-multi-instantiate: Derive the device name from parent
commit 24a8d78a9affb63e5ced313ccde6888fe96edc6e upstream.
When naming the new devices, instead of using the ACPI ID in
the name as base, using the parent device's name. That makes
it possible to support multiple multi-instance i2c devices
of the same type in the same system.
This fixes an issue seen on some Intel Kaby Lake based
boards:
sysfs: cannot create duplicate filename '/devices/pci0000:00/0000:00:15.0/i2c_designware.0/i2c-0/i2c-INT3515-tps6598x.0'
Fixes: 2336dfadfb1e ("platform/x86: i2c-multi-instantiate: Allow to have same slaves")
Cc: stable@vger.kernel.org
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/i2c-multi-instantiate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c index 197d8a192721..70efa3d29825 100644 --- a/drivers/platform/x86/i2c-multi-instantiate.c +++ b/drivers/platform/x86/i2c-multi-instantiate.c @@ -92,7 +92,7 @@ static int i2c_multi_inst_probe(struct platform_device *pdev) for (i = 0; i < multi->num_clients && inst_data[i].type; i++) { memset(&board_info, 0, sizeof(board_info)); strlcpy(board_info.type, inst_data[i].type, I2C_NAME_SIZE); - snprintf(name, sizeof(name), "%s-%s.%d", match->id, + snprintf(name, sizeof(name), "%s-%s.%d", dev_name(dev), inst_data[i].type, i); board_info.dev_name = name; switch (inst_data[i].flags & IRQ_RESOURCE_TYPE) { |