From: Jarkko Nikula Date: Thu, 10 Oct 2013 14:19:17 +0000 (+0300) Subject: spi: Fix modalias for ACPI enumerated SPI devices X-Git-Tag: v3.13-rc1~123^2~30^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf9eb39c6f7b42fdf9aa6f1af28780b2522a847a;p=platform%2Fkernel%2Flinux-stable.git spi: Fix modalias for ACPI enumerated SPI devices There is a minor fault about ACPI enumerated SPI devices with their modalias attribute. Now modalias is set by device instance not by hardware ID. For example "spi:INTABCD:00", "spi:INTABCD:01" etc. This means each device instance gets different modalias which does match with generated modules.alias. Currently this is not problem as matching can happen also with "acpi:INTABCD" modalias. Fix this by using ACPI hardware ID. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9e039c6..e57e9ac 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1025,7 +1025,7 @@ static acpi_status acpi_spi_add_device(acpi_handle handle, u32 level, return AE_OK; } - strlcpy(spi->modalias, dev_name(&adev->dev), sizeof(spi->modalias)); + strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias)); if (spi_add_device(spi)) { dev_err(&master->dev, "failed to add SPI device %s from ACPI\n", dev_name(&adev->dev));