diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:19 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-25 09:51:19 +0100 |
| commit | 4c4b8da17d59f35b0aafe855269852ce01f11fba (patch) | |
| tree | ffca31674db326dfc22f2072b930d698d450da13 /drivers/spi | |
| parent | 5b66fd1812513226d0740b4f84462bae99a8f85d (diff) | |
| parent | cf9eb39c6f7b42fdf9aa6f1af28780b2522a847a (diff) | |
| download | linux-4c4b8da17d59f35b0aafe855269852ce01f11fba.tar.bz2 | |
Merge remote-tracking branch 'spi/fix/modalias' into spi-linus
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9e039c60c068..e57e9acd75cb 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)); |