Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c70aac0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  zcache: Fix build error when sysfs is not defined
  zcache: Use div_u64 for 64-bit division
  staging:rts_pstor: fix thread synchronization flow
  drivers:staging:solo6x10:add the missed slab.h
  staging: zcache: include module.h for MODULE_LICENSE
  drivers/staging/hv/blkvsc_drv.c: eliminate NULL pointer dereference
  Staging: Add clk API note to nvec/TODO
  drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c: adjust array index
  staging: more missing slab.h inclusions
  drivers/staging/solo6x10/p2m.c needs slab.h
  drivers/staging/solo6x10/core.c needs slab.h
  drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h
  drivers/staging/speakup/devsynth.c: fix "buffer size is not provably correct" error
  Staging: iio: add some unlocks to raw_read() functions
  staging: ft1000_proc needs asm/io.h for inw/outw on sparc
  staging: rtl8192u: declare MODULE_FIRMWARE
  gma500: Fix clashes with DRM updates
  staging: zcache: module is GPL
  staging: fix zcache building
parents 06e727d2 d8c778fd

drivers/staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c

+1 −1
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ int AthCreateCommandList(struct ps_cmd_packet **HciPacketList, u32 *numPackets) 
    for(count = 0; count < Patch_Count; count++) {



        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Freeing Patch Buffer %d \r\n",count));

        kfree(RamPatch[Patch_Count].Data);

	kfree(RamPatch[count].Data);

    }



    for(count = 0; count < Tag_Count; count++) {

drivers/staging/dt3155v4l/dt3155v4l.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/stringify.h>

#include <linux/delay.h>

#include <linux/kthread.h>

#include <linux/slab.h>

#include <media/v4l2-dev.h>

#include <media/v4l2-ioctl.h>

#include <media/videobuf2-dma-contig.h>

drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/string.h>

#include <linux/vmalloc.h>

#include <linux/netdevice.h>

#include <asm/io.h>

#include <asm/uaccess.h>

#include "ft1000.h"

drivers/staging/hv/blkvsc_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int blkvsc_do_operation(struct block_device_context *blkdev, 


	page_buf = alloc_page(GFP_KERNEL);

	if (!page_buf) {

		kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req);

		kmem_cache_free(blkdev->request_pool, blkvsc_req);

		return -ENOMEM;

	}
@@ -422,7 +422,7 @@ cleanup: 


	__free_page(page_buf);



	kmem_cache_free(blkvsc_req->dev->request_pool, blkvsc_req);

	kmem_cache_free(blkdev->request_pool, blkvsc_req);



	return ret;

}

drivers/staging/iio/accel/adis16203_core.c

+6 −2
Original line number Diff line number Diff line
@@ -311,14 +311,18 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, 
		mutex_lock(&indio_dev->mlock);

		addr = adis16203_addresses[chan->address][0];

		ret = adis16203_spi_read_reg_16(indio_dev, addr, &val16);

		if (ret)

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;

		}



		if (val16 & ADIS16203_ERROR_ACTIVE) {

			ret = adis16203_check_status(indio_dev);

			if (ret)

			if (ret) {

				mutex_unlock(&indio_dev->mlock);

				return ret;

			}

		}

		val16 = val16 & ((1 << chan->scan_type.realbits) - 1);

		if (chan->scan_type.sign == 's')

			val16 = (s16)(val16 <<