[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
index c0a6dce800a3..d04242aee40d 100644
--- a/drivers/spi/spidev.c
+++ b/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;
@@ -364,6 +364,7 @@ spidev_ioctl(struct inode *inode, struct file *filp,
                         break;
                 }
                 if (__copy_from_user(ioc, (void __user *)arg, tmp)) {
+                        kfree(ioc);
                         retval = -EFAULT;
                         break;
                 }
@@ -484,7 +485,7 @@ static int spidev_probe(struct spi_device *spi)
          * Reusing minors is fine so long as udev or mdev is working.
          */
         mutex_lock(&device_list_lock);
-        minor = find_first_zero_bit(minors, ARRAY_SIZE(minors));
+        minor = find_first_zero_bit(minors, N_SPI_MINORS);
         if (minor < N_SPI_MINORS) {
                 spidev->dev.parent = &spi->dev;
                 spidev->dev.class = &spidev_class;