Commit c7230a48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "One new device ID here, plus an error handling fix - nothing
  remarkable in either"

* tag 'spi-fix-v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spidev: Add cisco device compatible
  spi: altera: Fix memory leak on error path
parents 5bec2487 396cf2a4

drivers/spi/spi-altera.c

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ static int altera_spi_probe(struct platform_device *pdev) 
			dev_err(&pdev->dev,

				"Invalid number of chipselect: %hu\n",

				pdata->num_chipselect);

			return -EINVAL;

			err = -EINVAL;

			goto exit;

		}



		master->num_chipselect = pdata->num_chipselect;

drivers/spi/spidev.c

+1 −0
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ static const struct of_device_id spidev_dt_ids[] = { 
	{ .compatible = "lwn,bk4" },

	{ .compatible = "dh,dhcom-board" },

	{ .compatible = "menlo,m53cpld" },

	{ .compatible = "cisco,spi-petra" },

	{},

};

MODULE_DEVICE_TABLE(of, spidev_dt_ids);