Commit 04ce9318 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver fixes from Greg KH:
 "Here are some small char and misc driver fixes for 5.3-rc2 to resolve
  some reported issues.

  Nothing major at all, some binder bugfixes for issues found, some new
  mei device ids, firmware building warning fixes, habanalabs fixes, a
  few other build fixes, and a MAINTAINERS update.

  All of these have been in linux-next with no reported issues"

* tag 'char-misc-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  test_firmware: fix a memory leak bug
  hpet: Fix division by zero in hpet_time_div()
  eeprom: make older eeprom drivers select NVMEM_SYSFS
  vmw_balloon: Remove Julien from the maintainers list
  fpga-manager: altera-ps-spi: Fix build error
  mei: me: add mule creek canyon (EHL) device ids
  binder: prevent transactions to context manager from its own process.
  binder: Set end of SG buffer area properly.
  firmware: Fix missing inline
  firmware: fix build errors in paged buffer handling code
  habanalabs: don't reset device when getting VRHOT
  habanalabs: use %pad for printing a dma_addr_t
parents 572782b2 d4fddac5

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -17172,7 +17172,6 @@ F: drivers/vme/ 
F:	include/linux/vme*



VMWARE BALLOON DRIVER

M:	Julien Freche <jfreche@vmware.com>

M:	Nadav Amit <namit@vmware.com>

M:	"VMware, Inc." <pv-drivers@vmware.com>

L:	linux-kernel@vger.kernel.org

drivers/android/binder.c

+3 −2
Original line number Diff line number Diff line
@@ -2988,7 +2988,7 @@ static void binder_transaction(struct binder_proc *proc, 
			else

				return_error = BR_DEAD_REPLY;

			mutex_unlock(&context->context_mgr_node_lock);

			if (target_node && target_proc == proc) {

			if (target_node && target_proc->pid == proc->pid) {

				binder_user_error("%d:%d got transaction to context manager from process owning it\n",

						  proc->pid, thread->pid);

				return_error = BR_FAILED_REPLY;
@@ -3239,7 +3239,8 @@ static void binder_transaction(struct binder_proc *proc, 
	buffer_offset = off_start_offset;

	off_end_offset = off_start_offset + tr->offsets_size;

	sg_buf_offset = ALIGN(off_end_offset, sizeof(void *));

	sg_buf_end_offset = sg_buf_offset + extra_buffers_size;

	sg_buf_end_offset = sg_buf_offset + extra_buffers_size -

		ALIGN(secctx_sz, sizeof(u64));

	off_min = 0;

	for (buffer_offset = off_start_offset; buffer_offset < off_end_offset;

	     buffer_offset += sizeof(binder_size_t)) {

drivers/base/firmware_loader/firmware.h

+2 −2
Original line number Diff line number Diff line
@@ -141,8 +141,8 @@ int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed); 
int fw_map_paged_buf(struct fw_priv *fw_priv);

#else

static inline void fw_free_paged_buf(struct fw_priv *fw_priv) {}

int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }

int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }

static inline int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }

static inline int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }

#endif



#endif /* __FIRMWARE_LOADER_H */

drivers/char/hpet.c

+1 −2
Original line number Diff line number Diff line
@@ -567,8 +567,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets, 
	unsigned long long m;



	m = hpets->hp_tick_freq + (dis >> 1);

	do_div(m, dis);

	return (unsigned long)m;

	return div64_ul(m, dis);

}



static int

drivers/fpga/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ config ALTERA_PR_IP_CORE_PLAT 
config FPGA_MGR_ALTERA_PS_SPI

	tristate "Altera FPGA Passive Serial over SPI"

	depends on SPI

	select BITREVERSE

	help

	  FPGA manager driver support for Altera Arria/Cyclone/Stratix

	  using the passive serial interface over SPI.

CRA Git | Maintained and supported by SUSTech CRA and CCSE