Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e00803a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/err' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

parents 0b2e8915 b716c4ff

drivers/spi/spi.c

+3 −0
Original line number Diff line number Diff line
@@ -851,6 +851,9 @@ static int spi_transfer_one_message(struct spi_master *master, 
	if (msg->status == -EINPROGRESS)

		msg->status = ret;



	if (msg->status)

		master->handle_err(master, msg);



	spi_finalize_current_message(master);



	return ret;

include/linux/spi/spi.h

+4 −0
Original line number Diff line number Diff line
@@ -294,6 +294,8 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) 
 *                    transfer_one_message are mutually exclusive; when both

 *                    are set, the generic subsystem does not call your

 *                    transfer_one callback.

 * @handle_err: the subsystem calls the driver to handle and error that occurs

 *		in the generic implementation of transfer_one_message().

 * @unprepare_message: undo any work done by prepare_message().

 * @cs_gpios: Array of GPIOs to use as chip select lines; one per CS

 *	number. Any individual value may be -ENOENT for CS lines that
@@ -448,6 +450,8 @@ struct spi_master { 
	void (*set_cs)(struct spi_device *spi, bool enable);

	int (*transfer_one)(struct spi_master *master, struct spi_device *spi,

			    struct spi_transfer *transfer);

	void (*handle_err)(struct spi_master *master,

			   struct spi_message *message);



	/* gpio chip select */

	int			*cs_gpios;