Merge remote-tracking branch 'spi/fix/modalias' into spi-linus

2013-10-25 09:51:19 +01:00 · 2013-10-25 09:51:19 +01:00 · 4c4b8da17d
parent 5b66fd1812 cf9eb39c6f
commit 4c4b8da17d
1 changed files with 1 additions and 1 deletions
--- 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));