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

Commit 6ac9f42c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc driver fixes from Greg KH:
 "Here are four small bugfixes for some char/misc drivers. Well, really
  three fixes and one fix for one of those fixes due to problems found
  by 0-day.

  This resolves some reported issues with the hwtracing drivers, and a
  reported regression for the thunderbolt subsystem. All of these have
  been in linux-next for a while now with no reported problems"

* tag 'char-misc-4.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  hwtracing: stm: fix build error on some arches
  intel_th: Use correct device when freeing buffers
  stm class: Use vmalloc for the master map
  thunderbolt: Handle NULL boot ACL entries properly
parents 34a8e640 806e3087

drivers/hwtracing/intel_th/msu.c

+3 −3
Original line number Diff line number Diff line
@@ -733,8 +733,8 @@ static int msc_buffer_win_alloc(struct msc *msc, unsigned int nr_blocks) 
		/* Reset the page to write-back before releasing */

		set_memory_wb((unsigned long)win->block[i].bdesc, 1);

#endif

		dma_free_coherent(msc_dev(msc), size, win->block[i].bdesc,

				  win->block[i].addr);

		dma_free_coherent(msc_dev(msc)->parent->parent, size,

				  win->block[i].bdesc, win->block[i].addr);

	}

	kfree(win);
@@ -769,7 +769,7 @@ static void msc_buffer_win_free(struct msc *msc, struct msc_window *win) 
		/* Reset the page to write-back before releasing */

		set_memory_wb((unsigned long)win->block[i].bdesc, 1);

#endif

		dma_free_coherent(msc_dev(win->msc), PAGE_SIZE,

		dma_free_coherent(msc_dev(win->msc)->parent->parent, PAGE_SIZE,

				  win->block[i].bdesc, win->block[i].addr);

	}

drivers/hwtracing/stm/core.c

+4 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/stm.h>

#include <linux/fs.h>

#include <linux/mm.h>

#include <linux/vmalloc.h>

#include "stm.h"



#include <uapi/linux/stm.h>
@@ -674,7 +675,7 @@ static void stm_device_release(struct device *dev) 
{

	struct stm_device *stm = to_stm_device(dev);



	kfree(stm);

	vfree(stm);

}



int stm_register_device(struct device *parent, struct stm_data *stm_data,
@@ -691,7 +692,7 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, 
		return -EINVAL;



	nmasters = stm_data->sw_end - stm_data->sw_start + 1;

	stm = kzalloc(sizeof(*stm) + nmasters * sizeof(void *), GFP_KERNEL);

	stm = vzalloc(sizeof(*stm) + nmasters * sizeof(void *));

	if (!stm)

		return -ENOMEM;
@@ -744,7 +745,7 @@ int stm_register_device(struct device *parent, struct stm_data *stm_data, 
	/* matches device_initialize() above */

	put_device(&stm->dev);

err_free:

	kfree(stm);

	vfree(stm);



	return err;

}

drivers/thunderbolt/icm.c

+1 −1
Original line number Diff line number Diff line
@@ -1255,7 +1255,7 @@ static int icm_ar_get_boot_acl(struct tb *tb, uuid_t *uuids, size_t nuuids) 
			/* Map empty entries to null UUID */

			uuid[0] = 0;

			uuid[1] = 0;

		} else {

		} else if (uuid[0] != 0 || uuid[1] != 0) {

			/* Upper two DWs are always one's */

			uuid[2] = 0xffffffff;

			uuid[3] = 0xffffffff;