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

Commit 490916d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 



Pull staging driver fixes from Greg Kroah-Hartman:
 "Here are some staging driver fixes for your 3.7-rc tree.

  Nothing major here, a number of iio driver fixups that were causing
  problems, some comedi driver bugfixes, and a bunch of tidspbridge
  warning squashing and other regressions fixed from the 3.6 release.

  All have been in the linux-next releases for a bit.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'staging-3.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (32 commits)
  staging: tidspbridge: delete unused mmu functions
  staging: tidspbridge: ioremap physical address of the stack segment in shm
  staging: tidspbridge: ioremap dsp sync addr
  staging: tidspbridge: change type to __iomem for per and core addresses
  staging: tidspbridge: drop const from custom mmu implementation
  staging: tidspbridge: request the right irq for mmu
  staging: ipack: add missing include (implicit declaration of function 'kfree')
  staging: ramster: depends on NET
  staging: omapdrm: fix allocation size for page addresses array
  staging: zram: Fix handling of incompressible pages
  Staging: android: binder: Allow using highmem for binder buffers
  Staging: android: binder: Fix memory leak on thread/process exit
  staging: comedi: ni_labpc: fix possible NULL deref during detach
  staging: comedi: das08: fix possible NULL deref during detach
  staging: comedi: amplc_pc263: fix possible NULL deref during detach
  staging: comedi: amplc_pc236: fix possible NULL deref during detach
  staging: comedi: amplc_pc236: fix invalid register access during detach
  staging: comedi: amplc_dio200: fix possible NULL deref during detach
  staging: comedi: 8255_pci: fix possible NULL deref during detach
  staging: comedi: ni_daq_700: fix dio subdevice regression
  ...
parents 299650ca 4d3f120a

drivers/iio/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ source "drivers/iio/frequency/Kconfig" 
source "drivers/iio/dac/Kconfig"

source "drivers/iio/common/Kconfig"

source "drivers/iio/gyro/Kconfig"

source "drivers/iio/light/Kconfig"

source "drivers/iio/magnetometer/Kconfig"



endif # IIO

drivers/iio/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ obj-y += frequency/ 
obj-y += dac/

obj-y += common/

obj-y += gyro/

obj-y += light/

obj-y += magnetometer/

drivers/staging/android/binder.c

+28 −2
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static int binder_update_page_range(struct binder_proc *proc, int allocate, 
		page = &proc->pages[(page_addr - proc->buffer) / PAGE_SIZE];



		BUG_ON(*page);

		*page = alloc_page(GFP_KERNEL | __GFP_ZERO);

		*page = alloc_page(GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);

		if (*page == NULL) {

			pr_err("binder: %d: binder_alloc_buf failed "

			       "for page at %p\n", proc->pid, page_addr);
@@ -2419,14 +2419,38 @@ static void binder_release_work(struct list_head *list) 
			struct binder_transaction *t;



			t = container_of(w, struct binder_transaction, work);

			if (t->buffer->target_node && !(t->flags & TF_ONE_WAY))

			if (t->buffer->target_node &&

			    !(t->flags & TF_ONE_WAY)) {

				binder_send_failed_reply(t, BR_DEAD_REPLY);

			} else {

				binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,

					"binder: undelivered transaction %d\n",

					t->debug_id);

				t->buffer->transaction = NULL;

				kfree(t);

				binder_stats_deleted(BINDER_STAT_TRANSACTION);

			}

		} break;

		case BINDER_WORK_TRANSACTION_COMPLETE: {

			binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,

				"binder: undelivered TRANSACTION_COMPLETE\n");

			kfree(w);

			binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE);

		} break;

		case BINDER_WORK_DEAD_BINDER_AND_CLEAR:

		case BINDER_WORK_CLEAR_DEATH_NOTIFICATION: {

			struct binder_ref_death *death;



			death = container_of(w, struct binder_ref_death, work);

			binder_debug(BINDER_DEBUG_DEAD_TRANSACTION,

				"binder: undelivered death notification, %p\n",

				death->cookie);

			kfree(death);

			binder_stats_deleted(BINDER_STAT_DEATH);

		} break;

		default:

			pr_err("binder: unexpected work type, %d, not freed\n",

			       w->type);

			break;

		}

	}
@@ -2899,6 +2923,7 @@ static void binder_deferred_release(struct binder_proc *proc) 
		nodes++;

		rb_erase(&node->rb_node, &proc->nodes);

		list_del_init(&node->work.entry);

		binder_release_work(&node->async_todo);

		if (hlist_empty(&node->refs)) {

			kfree(node);

			binder_stats_deleted(BINDER_STAT_NODE);
@@ -2937,6 +2962,7 @@ static void binder_deferred_release(struct binder_proc *proc) 
		binder_delete_ref(ref);

	}

	binder_release_work(&proc->todo);

	binder_release_work(&proc->delivered_death);

	buffers = 0;



	while ((n = rb_first(&proc->allocated_buffers))) {

drivers/staging/comedi/drivers/8255_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -289,6 +289,8 @@ static void pci_8255_detach(struct comedi_device *dev) 
	struct comedi_subdevice *s;

	int i;



	if (!board || !devpriv)

		return;

	if (dev->subdevices) {

		for (i = 0; i < board->n_8255; i++) {

			s = &dev->subdevices[i];

drivers/staging/comedi/drivers/amplc_dio200.c

+2 −0
Original line number Diff line number Diff line
@@ -1410,6 +1410,8 @@ static void dio200_detach(struct comedi_device *dev) 
	const struct dio200_layout_struct *layout;

	unsigned n;



	if (!thisboard)

		return;

	if (dev->irq)

		free_irq(dev->irq, dev);

	if (dev->subdevices) {