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_watterott.c | |
| parent | 60d6a21b1ec25629e93f11464fae3b2045c3370f (diff) | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
| download | linux-bcabc6f32888435932364702ebf368164dea6678.tar.gz linux-bcabc6f32888435932364702ebf368164dea6678.tar.bz2 linux-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_watterott.c')
| -rw-r--r-- | drivers/staging/fbtft/fb_watterott.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/fbtft/fb_watterott.c b/drivers/staging/fbtft/fb_watterott.c index c4800497169c..14beefefa9ac 100644 --- a/drivers/staging/fbtft/fb_watterott.c +++ b/drivers/staging/fbtft/fb_watterott.c @@ -162,7 +162,7 @@ static int init_display(struct fbtft_par *par) /* enable SPI interface by having CS and MOSI low during reset */ save_mode = par->spi->mode; par->spi->mode |= SPI_CS_HIGH; - ret = par->spi->master->setup(par->spi); /* set CS inactive low */ + ret = spi_setup(par->spi); /* set CS inactive low */ if (ret) { dev_err(par->info->device, "Could not set SPI_CS_HIGH\n"); return ret; @@ -173,7 +173,7 @@ static int init_display(struct fbtft_par *par) par->fbtftops.reset(par); mdelay(1000); par->spi->mode = save_mode; - ret = par->spi->master->setup(par->spi); + ret = spi_setup(par->spi); if (ret) { dev_err(par->info->device, "Could not restore SPI mode\n"); return ret; |