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

Commit 0b0f7f1c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging fixes from Greg KH:
 "Here are a number of staging, and IIO driver, fixes for 3.13-rc2 that
  resolve issues that have been reported for 3.13-rc1.  All of these
  have been in linux-next for a bit this week"

* tag 'staging-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (25 commits)
  Staging: tidspbridge: disable driver
  staging: zsmalloc: Ensure handle is never 0 on success
  staging/lustre/ptlrpc: fix ptlrpc_stop_pinger logic
  staging: r8188eu: Fix AP mode
  Staging: btmtk_usb: Add hdev parameter to hdev->send driver callback
  Staging: go7007: fix up some remaining go->dev issues
  staging: imx-drm: Fix modular build of DRM_IMX_IPUV3
  staging: ft1000: fix use of potentially uninitialized variable
  Revert "staging:media: Use dev_dbg() instead of pr_debug()"
  Staging: zram: Fix memory leak by refcount mismatch
  staging: vt6656: [BUG] Fix for TX USB resets from vendors driver.
  staging: nvec: potential NULL dereference on error path
  Staging: vt6655-6: potential NULL dereference in hostap_disable_hostapd()
  staging: comedi: s626: fix value written by s626_set_dac()
  Staging: comedi: pcl730: fix some bitwise vs logical AND bugs
  staging: comedi: fix potentially uninitialised variable
  iio:accel:kxsd9 fix missing mutex unlock
  iio: adc: ti_am335x_adc: avoid double free of buffer.
  staging:iio: Fix hmc5843 Kconfig dependencies
  iio: Fix tcs3472 Kconfig dependencies
  ...
parents f4968636 930ba4a3

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

+3 −2
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static int hid_accel_3d_probe(struct platform_device *pdev) 
error_iio_unreg:

	iio_device_unregister(indio_dev);

error_remove_trigger:

	hid_sensor_remove_trigger(indio_dev);

	hid_sensor_remove_trigger(&accel_state->common_attributes);

error_unreg_buffer_funcs:

	iio_triggered_buffer_cleanup(indio_dev);

error_free_dev_mem:
@@ -363,10 +363,11 @@ static int hid_accel_3d_remove(struct platform_device *pdev) 
{

	struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;

	struct iio_dev *indio_dev = platform_get_drvdata(pdev);

	struct accel_3d_state *accel_state = iio_priv(indio_dev);



	sensor_hub_remove_callback(hsdev, HID_USAGE_SENSOR_ACCEL_3D);

	iio_device_unregister(indio_dev);

	hid_sensor_remove_trigger(indio_dev);

	hid_sensor_remove_trigger(&accel_state->common_attributes);

	iio_triggered_buffer_cleanup(indio_dev);

	kfree(indio_dev->channels);

drivers/iio/accel/kxsd9.c

+4 −3
Original line number Diff line number Diff line
@@ -112,9 +112,10 @@ static int kxsd9_read(struct iio_dev *indio_dev, u8 address) 
	mutex_lock(&st->buf_lock);

	st->tx[0] = KXSD9_READ(address);

	ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));

	if (ret)

	if (!ret)

		ret = (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);

	mutex_unlock(&st->buf_lock);

	return ret;

	return (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);

}



static IIO_CONST_ATTR(accel_scale_available,

drivers/iio/adc/at91_adc.c

+1 −0
Original line number Diff line number Diff line
@@ -1047,6 +1047,7 @@ static int at91_adc_probe(struct platform_device *pdev) 
	} else {

		if (!st->caps->has_tsmr) {

			dev_err(&pdev->dev, "We don't support non-TSMR adc\n");

			ret = -ENODEV;

			goto error_disable_adc_clk;

		}

drivers/iio/adc/mcp3422.c

+4 −4
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ static const int mcp3422_sample_rates[4] = { 


/* sample rates to sign extension table */

static const int mcp3422_sign_extend[4] = {

	[MCP3422_SRATE_240] = 12,

	[MCP3422_SRATE_60] = 14,

	[MCP3422_SRATE_15] = 16,

	[MCP3422_SRATE_3] = 18 };

	[MCP3422_SRATE_240] = 11,

	[MCP3422_SRATE_60] = 13,

	[MCP3422_SRATE_15] = 15,

	[MCP3422_SRATE_3] = 17 };



/* Client data (each client gets its own) */

struct mcp3422 {

drivers/iio/adc/ti_am335x_adc.c

+5 −2
Original line number Diff line number Diff line
@@ -229,12 +229,15 @@ static int tiadc_iio_buffered_hardware_setup(struct iio_dev *indio_dev, 
	unsigned long flags,

	const struct iio_buffer_setup_ops *setup_ops)

{

	struct iio_buffer *buffer;

	int ret;



	indio_dev->buffer = iio_kfifo_allocate(indio_dev);

	if (!indio_dev->buffer)

	buffer = iio_kfifo_allocate(indio_dev);

	if (!buffer)

		return -ENOMEM;



	iio_device_attach_buffer(indio_dev, buffer);



	ret = request_threaded_irq(irq,	pollfunc_th, pollfunc_bh,

				flags, indio_dev->name, indio_dev);

	if (ret)