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

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

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

Pull staging/IIO driver fixes from Greg KH:
 "Here are some staging and IIO driver fixes for 3.18-rc7 that resolve a
  number of reported issues, and a new device id for a staging wireless
  driver.

  All of these have been in linux-next"

* tag 'staging-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8188eu: Add new device ID for DLink GO-USB-N150
  staging: r8188eu: Fix scheduling while atomic error introduced in commit fadbe0cd
  iio: accel: bmc150: set low default thresholds
  iio: accel: bmc150: Fix iio_event_spec direction
  iio: accel: bmc150: Send x, y and z motion separately
  iio: accel: bmc150: Error handling when mode set fails
  iio: gyro: bmg160: Fix iio_event_spec direction
  iio: gyro: bmg160: Send x, y and z motion separately
  iio: gyro: bmg160: Don't let interrupt mode to be open drain
  iio: gyro: bmg160: Error handling when mode set fails
  iio: adc: men_z188_adc: Add terminating entry for men_z188_ids
  iio: accel: kxcjk-1013: Fix kxcjk10013_set_range
  iio: Fix IIO_EVENT_CODE_EXTRACT_DIR bit mask
parents 6f93840d 6d4556fc

drivers/iio/accel/bmc150-accel.c

+33 −7
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 


#define BMC150_ACCEL_REG_INT_STATUS_2		0x0B

#define BMC150_ACCEL_ANY_MOTION_MASK		0x07

#define BMC150_ACCEL_ANY_MOTION_BIT_X		BIT(0)

#define BMC150_ACCEL_ANY_MOTION_BIT_Y		BIT(1)

#define BMC150_ACCEL_ANY_MOTION_BIT_Z		BIT(2)

#define BMC150_ACCEL_ANY_MOTION_BIT_SIGN	BIT(3)



#define BMC150_ACCEL_REG_PMU_LPW		0x11
@@ -92,9 +95,9 @@ 
#define BMC150_ACCEL_SLOPE_THRES_MASK		0xFF



/* Slope duration in terms of number of samples */

#define BMC150_ACCEL_DEF_SLOPE_DURATION	2

#define BMC150_ACCEL_DEF_SLOPE_DURATION		1

/* in terms of multiples of g's/LSB, based on range */

#define BMC150_ACCEL_DEF_SLOPE_THRESHOLD	5

#define BMC150_ACCEL_DEF_SLOPE_THRESHOLD	1



#define BMC150_ACCEL_REG_XOUT_L		0x02
@@ -536,6 +539,9 @@ static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on) 
	if (ret < 0) {

		dev_err(&data->client->dev,

			"Failed: bmc150_accel_set_power_state for %d\n", on);

		if (on)

			pm_runtime_put_noidle(&data->client->dev);



		return ret;

	}
@@ -811,6 +817,7 @@ static int bmc150_accel_write_event_config(struct iio_dev *indio_dev, 


	ret =  bmc150_accel_setup_any_motion_interrupt(data, state);

	if (ret < 0) {

		bmc150_accel_set_power_state(data, false);

		mutex_unlock(&data->mutex);

		return ret;

	}
@@ -846,7 +853,7 @@ static const struct attribute_group bmc150_accel_attrs_group = { 


static const struct iio_event_spec bmc150_accel_event = {

		.type = IIO_EV_TYPE_ROC,

		.dir = IIO_EV_DIR_RISING | IIO_EV_DIR_FALLING,

		.dir = IIO_EV_DIR_EITHER,

		.mask_separate = BIT(IIO_EV_INFO_VALUE) |

				 BIT(IIO_EV_INFO_ENABLE) |

				 BIT(IIO_EV_INFO_PERIOD)
@@ -1054,6 +1061,7 @@ static int bmc150_accel_data_rdy_trigger_set_state(struct iio_trigger *trig, 
	else

		ret = bmc150_accel_setup_new_data_interrupt(data, state);

	if (ret < 0) {

		bmc150_accel_set_power_state(data, false);

		mutex_unlock(&data->mutex);

		return ret;

	}
@@ -1092,12 +1100,26 @@ static irqreturn_t bmc150_accel_event_handler(int irq, void *private) 
	else

		dir = IIO_EV_DIR_RISING;



	if (ret & BMC150_ACCEL_ANY_MOTION_MASK)

	if (ret & BMC150_ACCEL_ANY_MOTION_BIT_X)

		iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL,

							0,

							IIO_MOD_X,

							IIO_EV_TYPE_ROC,

							dir),

							data->timestamp);

	if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Y)

		iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL,

							0,

							IIO_MOD_X_OR_Y_OR_Z,

							IIO_MOD_Y,

							IIO_EV_TYPE_ROC,

							IIO_EV_DIR_EITHER),

							dir),

							data->timestamp);

	if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Z)

		iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ACCEL,

							0,

							IIO_MOD_Z,

							IIO_EV_TYPE_ROC,

							dir),

							data->timestamp);

ack_intr_status:

	if (!data->dready_trigger_on)
@@ -1354,10 +1376,14 @@ static int bmc150_accel_runtime_suspend(struct device *dev) 
{

	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));

	struct bmc150_accel_data *data = iio_priv(indio_dev);

	int ret;



	dev_dbg(&data->client->dev,  __func__);

	ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_SUSPEND, 0);

	if (ret < 0)

		return -EAGAIN;



	return bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_SUSPEND, 0);

	return 0;

}



static int bmc150_accel_runtime_resume(struct device *dev)

drivers/iio/accel/kxcjk-1013.c

+2 −0
Original line number Diff line number Diff line
@@ -269,6 +269,8 @@ static int kxcjk1013_set_range(struct kxcjk1013_data *data, int range_index) 
		return ret;

	}



	ret &= ~(KXCJK1013_REG_CTRL1_BIT_GSEL0 |

		 KXCJK1013_REG_CTRL1_BIT_GSEL1);

	ret |= (KXCJK1013_scale_table[range_index].gsel_0 << 3);

	ret |= (KXCJK1013_scale_table[range_index].gsel_1 << 4);

drivers/iio/adc/men_z188_adc.c

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ static void men_z188_remove(struct mcb_device *dev) 


static const struct mcb_device_id men_z188_ids[] = {

	{ .device = 0xbc },

	{ }

};

MODULE_DEVICE_TABLE(mcb, men_z188_ids);

drivers/iio/gyro/bmg160.c

+49 −4
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
#define BMG160_REG_INT_EN_0		0x15

#define BMG160_DATA_ENABLE_INT		BIT(7)



#define BMG160_REG_INT_EN_1		0x16

#define BMG160_INT1_BIT_OD		BIT(1)



#define BMG160_REG_XOUT_L		0x02

#define BMG160_AXIS_TO_REG(axis)	(BMG160_REG_XOUT_L + (axis * 2))
@@ -82,6 +85,9 @@ 


#define BMG160_REG_INT_STATUS_2	0x0B

#define BMG160_ANY_MOTION_MASK		0x07

#define BMG160_ANY_MOTION_BIT_X		BIT(0)

#define BMG160_ANY_MOTION_BIT_Y		BIT(1)

#define BMG160_ANY_MOTION_BIT_Z		BIT(2)



#define BMG160_REG_TEMP		0x08

#define BMG160_TEMP_CENTER_VAL		23
@@ -222,6 +228,19 @@ static int bmg160_chip_init(struct bmg160_data *data) 
	data->slope_thres = ret;



	/* Set default interrupt mode */

	ret = i2c_smbus_read_byte_data(data->client, BMG160_REG_INT_EN_1);

	if (ret < 0) {

		dev_err(&data->client->dev, "Error reading reg_int_en_1\n");

		return ret;

	}

	ret &= ~BMG160_INT1_BIT_OD;

	ret = i2c_smbus_write_byte_data(data->client,

					BMG160_REG_INT_EN_1, ret);

	if (ret < 0) {

		dev_err(&data->client->dev, "Error writing reg_int_en_1\n");

		return ret;

	}



	ret = i2c_smbus_write_byte_data(data->client,

					BMG160_REG_INT_RST_LATCH,

					BMG160_INT_MODE_LATCH_INT |
@@ -250,6 +269,9 @@ static int bmg160_set_power_state(struct bmg160_data *data, bool on) 
	if (ret < 0) {

		dev_err(&data->client->dev,

			"Failed: bmg160_set_power_state for %d\n", on);

		if (on)

			pm_runtime_put_noidle(&data->client->dev);



		return ret;

	}

#endif
@@ -705,6 +727,7 @@ static int bmg160_write_event_config(struct iio_dev *indio_dev, 


	ret =  bmg160_setup_any_motion_interrupt(data, state);

	if (ret < 0) {

		bmg160_set_power_state(data, false);

		mutex_unlock(&data->mutex);

		return ret;

	}
@@ -743,7 +766,7 @@ static const struct attribute_group bmg160_attrs_group = { 


static const struct iio_event_spec bmg160_event = {

		.type = IIO_EV_TYPE_ROC,

		.dir = IIO_EV_DIR_RISING | IIO_EV_DIR_FALLING,

		.dir = IIO_EV_DIR_EITHER,

		.mask_shared_by_type = BIT(IIO_EV_INFO_VALUE) |

				       BIT(IIO_EV_INFO_ENABLE)

};
@@ -871,6 +894,7 @@ static int bmg160_data_rdy_trigger_set_state(struct iio_trigger *trig, 
	else

		ret = bmg160_setup_new_data_interrupt(data, state);

	if (ret < 0) {

		bmg160_set_power_state(data, false);

		mutex_unlock(&data->mutex);

		return ret;

	}
@@ -908,10 +932,24 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) 
	else

		dir = IIO_EV_DIR_FALLING;



	if (ret & BMG160_ANY_MOTION_MASK)

	if (ret & BMG160_ANY_MOTION_BIT_X)

		iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,

							0,

							IIO_MOD_X,

							IIO_EV_TYPE_ROC,

							dir),

							data->timestamp);

	if (ret & BMG160_ANY_MOTION_BIT_Y)

		iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,

							0,

							IIO_MOD_Y,

							IIO_EV_TYPE_ROC,

							dir),

							data->timestamp);

	if (ret & BMG160_ANY_MOTION_BIT_Z)

		iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL,

							0,

							IIO_MOD_X_OR_Y_OR_Z,

							IIO_MOD_Z,

							IIO_EV_TYPE_ROC,

							dir),

							data->timestamp);
@@ -1169,8 +1207,15 @@ static int bmg160_runtime_suspend(struct device *dev) 
{

	struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));

	struct bmg160_data *data = iio_priv(indio_dev);

	int ret;



	return bmg160_set_mode(data, BMG160_MODE_SUSPEND);

	ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND);

	if (ret < 0) {

		dev_err(&data->client->dev, "set mode failed\n");

		return -EAGAIN;

	}



	return 0;

}



static int bmg160_runtime_resume(struct device *dev)

drivers/staging/rtl8188eu/core/rtw_cmd.c

+11 −11
Original line number Diff line number Diff line
@@ -275,11 +275,11 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 
	if (check_fwstate(pmlmepriv, _FW_LINKED) == true)

		rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SCAN, 1);



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (ph2c == NULL)

		return _FAIL;



	psurveyPara = kzalloc(sizeof(struct sitesurvey_parm), GFP_KERNEL);

	psurveyPara = kzalloc(sizeof(struct sitesurvey_parm), GFP_ATOMIC);

	if (psurveyPara == NULL) {

		kfree(ph2c);

		return _FAIL;
@@ -405,7 +405,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
	else

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_notice_, ("+Join cmd: SSid =[%s]\n", pmlmepriv->assoc_ssid.Ssid));



	pcmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	pcmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (pcmd == NULL) {

		res = _FAIL;

		RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("rtw_joinbss_cmd: memory allocate for cmd_obj fail!!!\n"));
@@ -755,13 +755,13 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) 
	u8	res = _SUCCESS;





	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);

	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

	if (pdrvextra_cmd_parm == NULL) {

		kfree(ph2c);

		res = _FAIL;
@@ -967,13 +967,13 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 lps_ctrl_type, u8 enqueue) 
	u8	res = _SUCCESS;



	if (enqueue) {

		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

		ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

		if (ph2c == NULL) {

			res = _FAIL;

			goto exit;

		}



		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);

		pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

		if (pdrvextra_cmd_parm == NULL) {

			kfree(ph2c);

			res = _FAIL;
@@ -1010,13 +1010,13 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time) 


	u8	res = _SUCCESS;



	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	ph2c = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (ph2c == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);

	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

	if (pdrvextra_cmd_parm == NULL) {

		kfree(ph2c);

		res = _FAIL;
@@ -1088,13 +1088,13 @@ u8 rtw_ps_cmd(struct adapter *padapter) 


	u8	res = _SUCCESS;



	ppscmd = kzalloc(sizeof(struct cmd_obj), GFP_KERNEL);

	ppscmd = kzalloc(sizeof(struct cmd_obj), GFP_ATOMIC);

	if (ppscmd == NULL) {

		res = _FAIL;

		goto exit;

	}



	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_KERNEL);

	pdrvextra_cmd_parm = kzalloc(sizeof(struct drvextra_cmd_parm), GFP_ATOMIC);

	if (pdrvextra_cmd_parm == NULL) {

		kfree(ppscmd);

		res = _FAIL;