Commit d3feaff4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver fixes from Greg KH:
 "Here are a number of small char/misc/whatever driver fixes. They
  include:

   - IIO driver fixes for some reported problems

   - nvmem driver fixes

   - fpga driver fixes

   - debugfs memory leak fix in the hv_balloon and irqdomain code
     (irqdomain change was acked by the maintainer)

  All have been in linux-next with no reported problems"

* tag 'char-misc-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (33 commits)
  kernel/irq/irqdomain.c: fix memory leak with using debugfs_lookup()
  HV: hv_balloon: fix memory leak with using debugfs_lookup()
  nvmem: qcom-spmi-sdam: fix module autoloading
  nvmem: core: fix return value
  nvmem: core: fix cell removal on error
  nvmem: core: fix device node refcounting
  nvmem: core: fix registration vs use race
  nvmem: core: fix cleanup after dev_set_name()
  nvmem: core: remove nvmem_config wp_gpio
  nvmem: core: initialise nvmem->id early
  nvmem: sunxi_sid: Always use 32-bit MMIO reads
  nvmem: brcm_nvram: Add check for kzalloc
  iio: imu: fxos8700: fix MAGN sensor scale and unit
  iio: imu: fxos8700: remove definition FXOS8700_CTRL_ODR_MIN
  iio: imu: fxos8700: fix failed initialization ODR mode assignment
  iio: imu: fxos8700: fix incorrect ODR mode readback
  iio: light: cm32181: Fix PM support on system with 2 I2C resources
  iio: hid: fix the retval in gyro_3d_capture_sample
  iio: hid: fix the retval in accel_3d_capture_sample
  iio: imu: st_lsm6dsx: fix build when CONFIG_IIO_TRIGGERED_BUFFER=m
  ...
parents 870c3a9a d83d7ed2

drivers/fpga/intel-m10-bmc-sec-update.c

+12 −5
Original line number Diff line number Diff line
@@ -574,20 +574,27 @@ static int m10bmc_sec_probe(struct platform_device *pdev) 
	len = scnprintf(buf, SEC_UPDATE_LEN_MAX, "secure-update%d",

			sec->fw_name_id);

	sec->fw_name = kmemdup_nul(buf, len, GFP_KERNEL);

	if (!sec->fw_name)

		return -ENOMEM;

	if (!sec->fw_name) {

		ret = -ENOMEM;

		goto fw_name_fail;

	}



	fwl = firmware_upload_register(THIS_MODULE, sec->dev, sec->fw_name,

				       &m10bmc_ops, sec);

	if (IS_ERR(fwl)) {

		dev_err(sec->dev, "Firmware Upload driver failed to start\n");

		kfree(sec->fw_name);

		xa_erase(&fw_upload_xa, sec->fw_name_id);

		return PTR_ERR(fwl);

		ret = PTR_ERR(fwl);

		goto fw_uploader_fail;

	}



	sec->fwl = fwl;

	return 0;



fw_uploader_fail:

	kfree(sec->fw_name);

fw_name_fail:

	xa_erase(&fw_upload_xa, sec->fw_name_id);

	return ret;

}



static int m10bmc_sec_remove(struct platform_device *pdev)

drivers/fpga/stratix10-soc.c

+2 −2
Original line number Diff line number Diff line
@@ -213,9 +213,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr, 
	/* Allocate buffers from the service layer's pool. */

	for (i = 0; i < NUM_SVC_BUFS; i++) {

		kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE);

		if (!kbuf) {

		if (IS_ERR(kbuf)) {

			s10_free_buffers(mgr);

			ret = -ENOMEM;

			ret = PTR_ERR(kbuf);

			goto init_done;

		}

drivers/hv/hv_balloon.c

+1 −1
Original line number Diff line number Diff line
@@ -1963,7 +1963,7 @@ static void hv_balloon_debugfs_init(struct hv_dynmem_device *b) 


static void  hv_balloon_debugfs_exit(struct hv_dynmem_device *b)

{

	debugfs_remove(debugfs_lookup("hv-balloon", NULL));

	debugfs_lookup_and_remove("hv-balloon", NULL);

}



#else

drivers/iio/accel/hid-sensor-accel-3d.c

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev, 
			hid_sensor_convert_timestamp(

					&accel_state->common_attributes,

					*(int64_t *)raw_data);

		ret = 0;

	break;

	default:

		break;

drivers/iio/adc/berlin2-adc.c

+3 −1
Original line number Diff line number Diff line
@@ -298,8 +298,10 @@ static int berlin2_adc_probe(struct platform_device *pdev) 
	int ret;



	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv));

	if (!indio_dev)

	if (!indio_dev) {

		of_node_put(parent_np);

		return -ENOMEM;

	}



	priv = iio_priv(indio_dev);