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

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:
 "A fix for recent sysfs breakage in serio subsystem plus a fixup to
  adxl34x driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: adxl34x - Fix bug in definition of ADXL346_2D_ORIENT
  Input: serio - fix sysfs layout
parents 846f29a6 241ecf1c

drivers/input/misc/adxl34x.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 


/* ORIENT ADXL346 only */

#define ADXL346_2D_VALID		(1 << 6)

#define ADXL346_2D_ORIENT(x)		(((x) & 0x3) >> 4)

#define ADXL346_2D_ORIENT(x)		(((x) & 0x30) >> 4)

#define ADXL346_3D_VALID		(1 << 3)

#define ADXL346_3D_ORIENT(x)		((x) & 0x7)

#define ADXL346_2D_PORTRAIT_POS		0	/* +X */

drivers/input/serio/serio.c

+17 −7
Original line number Diff line number Diff line
@@ -455,16 +455,26 @@ static DEVICE_ATTR_RO(type); 
static DEVICE_ATTR_RO(proto);

static DEVICE_ATTR_RO(id);

static DEVICE_ATTR_RO(extra);

static DEVICE_ATTR_RO(modalias);

static DEVICE_ATTR_WO(drvctl);

static DEVICE_ATTR(description, S_IRUGO, serio_show_description, NULL);

static DEVICE_ATTR(bind_mode, S_IWUSR | S_IRUGO, serio_show_bind_mode, serio_set_bind_mode);



static struct attribute *serio_device_id_attrs[] = {

	&dev_attr_type.attr,

	&dev_attr_proto.attr,

	&dev_attr_id.attr,

	&dev_attr_extra.attr,

	NULL

};



static struct attribute_group serio_id_attr_group = {

	.name	= "id",

	.attrs	= serio_device_id_attrs,

};



static DEVICE_ATTR_RO(modalias);

static DEVICE_ATTR_WO(drvctl);

static DEVICE_ATTR(description, S_IRUGO, serio_show_description, NULL);

static DEVICE_ATTR(bind_mode, S_IWUSR | S_IRUGO, serio_show_bind_mode, serio_set_bind_mode);



static struct attribute *serio_device_attrs[] = {

	&dev_attr_modalias.attr,

	&dev_attr_description.attr,

	&dev_attr_drvctl.attr,
@@ -472,13 +482,13 @@ static struct attribute *serio_device_id_attrs[] = { 
	NULL

};



static struct attribute_group serio_id_attr_group = {

	.name	= "id",

	.attrs	= serio_device_id_attrs,

static struct attribute_group serio_device_attr_group = {

	.attrs	= serio_device_attrs,

};



static const struct attribute_group *serio_device_attr_groups[] = {

	&serio_id_attr_group,

	&serio_device_attr_group,

	NULL

};