]> Git Repo - linux.git/commitdiff
Merge remote-tracking branches 'spi/fix/bcm63xx', 'spi/fix/doc', 'spi/fix/mediatek...
authorMark Brown <[email protected]>
Mon, 30 Nov 2015 12:26:47 +0000 (12:26 +0000)
committerMark Brown <[email protected]>
Mon, 30 Nov 2015 12:26:47 +0000 (12:26 +0000)
1  2  3  4  5 
drivers/spi/spi.c

diff --combined drivers/spi/spi.c
index a0e346f3b71e42f214b9080fb47ae558554e7f44,e2415be209d5a77e9224add30db37d65244fabda,20ef4693d48fbcaef27b29d6a6bfe6e1f9e24457,e2415be209d5a77e9224add30db37d65244fabda,e2415be209d5a77e9224add30db37d65244fabda..2b0a8ec3affb87333f8bdb2e9a2d9ad95855d4c1
@@@@@@ -376,6 -376,6 -376,7 -376,6 -376,6 +376,7 @@@@@@ static void spi_drv_shutdown(struct dev
     
     /**
      * __spi_register_driver - register a SPI driver
++ ++ * @owner: owner module of the driver to register
      * @sdrv: the driver to register
      * Context: can sleep
      *
@@@@@@ -2130,7 -2130,6 -2131,6 -2130,6 -2130,6 +2131,7 @@@@@@ static int __spi_validate(struct spi_de
         * Set transfer tx_nbits and rx_nbits as single transfer default
         * (SPI_NBITS_SINGLE) if it is not set for this transfer.
         */
 ++++   message->frame_length = 0;
        list_for_each_entry(xfer, &message->transfers, transfer_list) {
                message->frame_length += xfer->len;
                if (!xfer->bits_per_word)
This page took 0.064464 seconds and 4 git commands to generate.