diff options
-rw-r--r-- | drivers/spi/spi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 656dd3e3220c..ad7f638a0a5b 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -1722,13 +1722,15 @@ static acpi_status acpi_register_spi_device(struct spi_master *master, | |||
1722 | return AE_OK; | 1722 | return AE_OK; |
1723 | } | 1723 | } |
1724 | 1724 | ||
1725 | acpi_set_modalias(adev, acpi_device_hid(adev), spi->modalias, | ||
1726 | sizeof(spi->modalias)); | ||
1727 | |||
1725 | if (spi->irq < 0) | 1728 | if (spi->irq < 0) |
1726 | spi->irq = acpi_dev_gpio_irq_get(adev, 0); | 1729 | spi->irq = acpi_dev_gpio_irq_get(adev, 0); |
1727 | 1730 | ||
1728 | acpi_device_set_enumerated(adev); | 1731 | acpi_device_set_enumerated(adev); |
1729 | 1732 | ||
1730 | adev->power.flags.ignore_parent = true; | 1733 | adev->power.flags.ignore_parent = true; |
1731 | strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias)); | ||
1732 | if (spi_add_device(spi)) { | 1734 | if (spi_add_device(spi)) { |
1733 | adev->power.flags.ignore_parent = false; | 1735 | adev->power.flags.ignore_parent = false; |
1734 | dev_err(&master->dev, "failed to add SPI device %s from ACPI\n", | 1736 | dev_err(&master->dev, "failed to add SPI device %s from ACPI\n", |