From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 28 Sep 2015 23:52:40 +0000 (+0200)
Subject: Merge 4.3-rc3 into staging-next
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bcabc6f32888435932364702ebf368164dea6678;p=openwrt%2Fstaging%2Fblogic.git

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>
---

bcabc6f32888435932364702ebf368164dea6678
diff --cc drivers/staging/fbtft/fb_uc1611.c
index 5b836614afe8,5cafa50d1fac..c9bbba1e1a5d
--- a/drivers/staging/fbtft/fb_uc1611.c
+++ b/drivers/staging/fbtft/fb_uc1611.c
@@@ -72,9 -72,11 +72,9 @@@ static int init_display(struct fbtft_pa
  {
  	int ret;
  
 -	fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
 -
  	/* 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;