From f2c390145d52e7d97131d3e9fbc6d8418dc69899 Mon Sep 17 00:00:00 2001 From: Domen Puncer Date: Wed, 23 May 2007 13:57:39 -0700 Subject: [PATCH] --- yaml --- r: 56877 b: refs/heads/master c: da90fa8ff671a0139772ec3b3e82c06077e82122 h: refs/heads/master i: 56875: 7d75f285ebf5d791e232990b4b2b904cfebc17c1 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spidev.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 433604347a20..3e15a946a36b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7add02d6247bff34005e040347d81777c80931c +refs/heads/master: da90fa8ff671a0139772ec3b3e82c06077e82122 diff --git a/trunk/drivers/spi/spidev.c b/trunk/drivers/spi/spidev.c index 225d6b2f82dd..bcfef04f547e 100644 --- a/trunk/drivers/spi/spidev.c +++ b/trunk/drivers/spi/spidev.c @@ -168,6 +168,12 @@ static int spidev_message(struct spidev_data *spidev, n--, k_tmp++, u_tmp++) { k_tmp->len = u_tmp->len; + total += k_tmp->len; + if (total > bufsiz) { + status = -EMSGSIZE; + goto done; + } + if (u_tmp->rx_buf) { k_tmp->rx_buf = buf; if (!access_ok(VERIFY_WRITE, u_tmp->rx_buf, u_tmp->len)) @@ -179,12 +185,6 @@ static int spidev_message(struct spidev_data *spidev, u_tmp->len)) goto done; } - - total += k_tmp->len; - if (total > bufsiz) { - status = -EMSGSIZE; - goto done; - } buf += k_tmp->len; k_tmp->cs_change = !!u_tmp->cs_change;