Merge tag 'spi-fix-v5.19-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...

Pull spi fixes from Mark Brown:
 "A couple of fixes that came in during the merge window: a driver fix
  for spurious timeouts in the fsi driver and an improvement to make the
  core display error messages for transfer_one_message() to help people
  debug things"

* tag 'spi-fix-v5.19-rc0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: core: Display return code when failing to transfer message
  spi: fsi: Fix spurious timeout

diff --combined drivers/spi/spi.c
index fe252a8075a7d5e88cd6168bd8d22ee0171d3adc,bbc8d4448e7925db83167cff4caa5081cf9152f9..b9e2c7e7c580d539ea8e585ae800a483a7f5244c
--- 1/drivers/spi/spi.c
--- 2/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -1672,7 -1672,8 +1672,8 @@@ static void __spi_pump_messages(struct 
        ret = ctlr->transfer_one_message(ctlr, msg);
        if (ret) {
                dev_err(&ctlr->dev,
-                       "failed to transfer one message from queue\n");
+                       "failed to transfer one message from queue: %d\n",
+                       ret);
                goto out;
        }
  
@@@ -2409,8 -2410,7 +2410,8 @@@ static int acpi_spi_add_resource(struc
                        } else {
                                struct acpi_device *adev;
  
 -                              if (acpi_bus_get_device(parent_handle, &adev))
 +                              adev = acpi_fetch_acpi_dev(parent_handle);
 +                              if (!adev)
                                        return -ENODEV;
  
                                ctlr = acpi_spi_find_controller_by_adev(adev);