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

diff --combined drivers/spi/spi.c
index 23756b0f90363c2f776718925cf7fba84d13c4a3,26f4afd19fafc77ba44ed9d0eaba679dba2f267c..d0b28bba38be6bfff2a420e9fc2850e5c84c690b
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -58,11 -58,6 +58,11 @@@ static ssize_
  modalias_show(struct device *dev, struct device_attribute *a, char *buf)
  {
        const struct spi_device *spi = to_spi_device(dev);
 +      int len;
 +
 +      len = acpi_device_modalias(dev, buf, PAGE_SIZE - 1);
 +      if (len != -ENODEV)
 +              return len;
  
        return sprintf(buf, "%s%s\n", SPI_MODULE_PREFIX, spi->modalias);
  }
@@@ -119,11 -114,6 +119,11 @@@ static int spi_match_device(struct devi
  static int spi_uevent(struct device *dev, struct kobj_uevent_env *env)
  {
        const struct spi_device         *spi = to_spi_device(dev);
 +      int rc;
 +
 +      rc = acpi_device_uevent_modalias(dev, env);
 +      if (rc != -ENODEV)
 +              return rc;
  
        add_uevent_var(env, "MODALIAS=%s%s", SPI_MODULE_PREFIX, spi->modalias);
        return 0;
@@@ -755,9 -745,7 +755,7 @@@ static void spi_pump_messages(struct kt
        ret = master->transfer_one_message(master, master->cur_msg);
        if (ret) {
                dev_err(&master->dev,
-                       "failed to transfer one message from queue: %d\n", ret);
-               master->cur_msg->status = ret;
-               spi_finalize_current_message(master);
+                       "failed to transfer one message from queue\n");
                return;
        }
  }