diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-29 01:52:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-29 01:52:40 +0200 |
| commit | bcabc6f32888435932364702ebf368164dea6678 (patch) | |
| tree | 34e88561ca4acf1b663e972ea48e7f3e3f4c9efc /drivers/staging/fbtft/fb_uc1611.c | |
| parent | Staging: rts5208: Coding style warnings fix for block comments (diff) | |
| parent | Linux 4.3-rc3 (diff) | |
| download | linux-dev-bcabc6f32888435932364702ebf368164dea6678.tar.xz linux-dev-bcabc6f32888435932364702ebf368164dea6678.zip | |
Merge 4.3-rc3 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fbtft/fb_uc1611.c')
| -rw-r--r-- | drivers/staging/fbtft/fb_uc1611.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/fbtft/fb_uc1611.c b/drivers/staging/fbtft/fb_uc1611.c index 5b836614afe8..c9bbba1e1a5d 100644 --- a/drivers/staging/fbtft/fb_uc1611.c +++ b/drivers/staging/fbtft/fb_uc1611.c @@ -74,7 +74,7 @@ static int init_display(struct fbtft_par *par) /* Set CS active high */ par->spi->mode |= SPI_CS_HIGH; - ret = par->spi->master->setup(par->spi); + ret = spi_setup(par->spi); if (ret) { dev_err(par->info->device, "Could not set SPI_CS_HIGH\n"); return ret; |