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

Commit 32faca66 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Here are some small staging driver fixes for 5.1-rc3, and one driver
  removal.

  The biggest thing here is the removal of the mt7621-eth driver as a
  "real" network driver was merged in 5.1-rc1 for this hardware, so this
  old driver can now be removed.

  Other than that, there are just a number of small fixes, all resolving
  reported issues and some potential corner cases for error handling
  paths.

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

* tag 'staging-5.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: vt6655: Remove vif check from vnt_interrupt
  staging: erofs: keep corrupted fs from crashing kernel in erofs_readdir()
  staging: octeon-ethernet: fix incorrect PHY mode
  staging: vc04_services: Fix an error code in vchiq_probe()
  staging: erofs: fix error handling when failed to read compresssed data
  staging: vt6655: Fix interrupt race condition on device start up.
  staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc
  staging: rtl8712: uninitialized memory in read_bbreg_hdl()
  staging: rtlwifi: rtl8822b: fix to avoid potential NULL pointer dereference
  staging: rtl8188eu: Fix potential NULL pointer dereference of kcalloc
  staging, mt7621-pci: fix build without pci support
  staging: speakup_soft: Fix alternate speech with other synths
  staging: axis-fifo: add CONFIG_OF dependency
  staging: olpc_dcon_xo_1: add missing 'const' qualifier
  staging: comedi: ni_mio_common: Fix divide-by-zero for DIO cmdtest
  staging: erofs: fix to handle error path of erofs_vmap()
  staging: mt7621-dts: update ethernet settings.
  staging: remove mt7621-eth
parents 52afe190 cc26358f

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ source "drivers/staging/ralink-gdma/Kconfig" 


source "drivers/staging/mt7621-mmc/Kconfig"



source "drivers/staging/mt7621-eth/Kconfig"



source "drivers/staging/mt7621-dts/Kconfig"



source "drivers/staging/gasket/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ obj-$(CONFIG_SPI_MT7621) += mt7621-spi/ 
obj-$(CONFIG_SOC_MT7621)	+= mt7621-dma/

obj-$(CONFIG_DMA_RALINK)	+= ralink-gdma/

obj-$(CONFIG_MTK_MMC)		+= mt7621-mmc/

obj-$(CONFIG_NET_MEDIATEK_SOC_STAGING)	+= mt7621-eth/

obj-$(CONFIG_SOC_MT7621)	+= mt7621-dts/

obj-$(CONFIG_STAGING_GASKET_FRAMEWORK)	+= gasket/

obj-$(CONFIG_XIL_AXIS_FIFO)	+= axis-fifo/

drivers/staging/axis-fifo/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#

config XIL_AXIS_FIFO

	tristate "Xilinx AXI-Stream FIFO IP core driver"

	depends on OF

	default n

	help

	  This adds support for the Xilinx AXI-Stream

drivers/staging/comedi/comedidev.h

+2 −0
Original line number Diff line number Diff line
@@ -1001,6 +1001,8 @@ int comedi_dio_insn_config(struct comedi_device *dev, 
			   unsigned int mask);

unsigned int comedi_dio_update_state(struct comedi_subdevice *s,

				     unsigned int *data);

unsigned int comedi_bytes_per_scan_cmd(struct comedi_subdevice *s,

				       struct comedi_cmd *cmd);

unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s);

unsigned int comedi_nscans_left(struct comedi_subdevice *s,

				unsigned int nscans);

drivers/staging/comedi/drivers.c

+29 −4
Original line number Diff line number Diff line
@@ -394,11 +394,13 @@ unsigned int comedi_dio_update_state(struct comedi_subdevice *s, 
EXPORT_SYMBOL_GPL(comedi_dio_update_state);



/**

 * comedi_bytes_per_scan() - Get length of asynchronous command "scan" in bytes

 * comedi_bytes_per_scan_cmd() - Get length of asynchronous command "scan" in

 * bytes

 * @s: COMEDI subdevice.

 * @cmd: COMEDI command.

 *

 * Determines the overall scan length according to the subdevice type and the

 * number of channels in the scan.

 * number of channels in the scan for the specified command.

 *

 * For digital input, output or input/output subdevices, samples for

 * multiple channels are assumed to be packed into one or more unsigned
@@ -408,9 +410,9 @@ EXPORT_SYMBOL_GPL(comedi_dio_update_state); 
 *

 * Returns the overall scan length in bytes.

 */

unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s)

unsigned int comedi_bytes_per_scan_cmd(struct comedi_subdevice *s,

				       struct comedi_cmd *cmd)

{

	struct comedi_cmd *cmd = &s->async->cmd;

	unsigned int num_samples;

	unsigned int bits_per_sample;
@@ -427,6 +429,29 @@ unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s) 
	}

	return comedi_samples_to_bytes(s, num_samples);

}

EXPORT_SYMBOL_GPL(comedi_bytes_per_scan_cmd);



/**

 * comedi_bytes_per_scan() - Get length of asynchronous command "scan" in bytes

 * @s: COMEDI subdevice.

 *

 * Determines the overall scan length according to the subdevice type and the

 * number of channels in the scan for the current command.

 *

 * For digital input, output or input/output subdevices, samples for

 * multiple channels are assumed to be packed into one or more unsigned

 * short or unsigned int values according to the subdevice's %SDF_LSAMPL

 * flag.  For other types of subdevice, samples are assumed to occupy a

 * whole unsigned short or unsigned int according to the %SDF_LSAMPL flag.

 *

 * Returns the overall scan length in bytes.

 */

unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s)

{

	struct comedi_cmd *cmd = &s->async->cmd;



	return comedi_bytes_per_scan_cmd(s, cmd);

}

EXPORT_SYMBOL_GPL(comedi_bytes_per_scan);



static unsigned int __comedi_nscans_left(struct comedi_subdevice *s,