From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Fainelli Subject: Re: [PATCH 3.7] spi/bcm63xx: fix transfer bits_per_words check Date: Sat, 24 Nov 2012 16:02:24 +0100 Message-ID: <50B0E180.1020606@openwrt.org> References: <1353764690-5961-1-git-send-email-jonas.gorski@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: Mark Brown , Kevin Cernekee , stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Maxime Bizon , spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org To: Jonas Gorski Return-path: In-Reply-To: <1353764690-5961-1-git-send-email-jonas.gorski-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: linux-spi.vger.kernel.org Le 24/11/2012 14:44, Jonas Gorski a =E9crit : > Transfers often do not have bits_per_words set, so use the spi device's > bits_per_words in this case. > > This fixes the driver rejecting valid transfers e.g. generated by > spi_write() or spi_read(). > > Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Signed-off-by: Jonas Gorski Acked-by: Florian Fainelli > --- > drivers/spi/spi-bcm63xx.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c > index a9f4049..d7c2916 100644 > --- a/drivers/spi/spi-bcm63xx.c > +++ b/drivers/spi/spi-bcm63xx.c > @@ -103,7 +103,8 @@ static int bcm63xx_spi_check_transfer(struct spi_devi= ce *spi, > { > u8 bits_per_word; > > - bits_per_word =3D (t) ? t->bits_per_word : spi->bits_per_word; > + bits_per_word =3D (t && t->bits_per_word) ? > + t->bits_per_word : spi->bits_per_word; > if (bits_per_word !=3D 8) { > dev_err(&spi->dev, "%s, unsupported bits_per_word=3D%d\n", > __func__, bits_per_word); > ---------------------------------------------------------------------------= --- Monitor your physical, virtual and cloud infrastructure from a single web console. Get in-depth insight into apps, servers, databases, vmware, SAP, cloud infrastructure, etc. Download 30-day Free Trial. Pricing starts from $795 for 25 servers or applications! http://p.sf.net/sfu/zoho_dev2dev_nov