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

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

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

Pull char/misc driver fixes from Greg KH:
 "Nothing huge, just a few small bugfixes for problems reported, and a
  device id update"

* tag 'char-misc-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  mei: add 9 series PCH mei device ids
  drivers/char/i8k.c: add Dell XPLS L421X
  MAINTAINERS: add HSI subsystem
  misc: mic: Suppress memory space sparse warnings
  misc: mic: Fix endianness issues.
  misc: mic: Fix user space namespace pollution from mic_common.h.
  misc: mic: Bug fix for sysfs poll usage.
  misc: mic: Minor bug fix in 'retry' loops.
  misc: mic: Change mic_notify(...) to return true.
  extcon: remove freed groups caused the panic or warning in unregister flow
  extcon: arizona: Get pdata from arizona structure not device
parents b19d69c7 76a96359

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -655,6 +655,11 @@ S: Stanford University 
S: Stanford, California 94305

S: USA



N: Carlos Chinea

E: carlos.chinea@nokia.com

E: cch.devel@gmail.com

D: Author of HSI Subsystem



N: Randolph Chung

E: tausq@debian.org

D: Linux/PA-RISC hacker

Documentation/mic/mpssd/mpssd.c

+12 −6
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static struct mic_device_desc *get_device_desc(struct mic_info *mic, int type) 
	int i;

	void *dp = get_dp(mic, type);



	for (i = mic_aligned_size(struct mic_bootparam); i < PAGE_SIZE;

	for (i = sizeof(struct mic_bootparam); i < PAGE_SIZE;

		i += mic_total_desc_size(d)) {

		d = dp + i;
@@ -445,8 +445,8 @@ init_vr(struct mic_info *mic, int fd, int type, 
		__func__, mic->name, vr0->va, vr0->info, vr_size,

		vring_size(MIC_VRING_ENTRIES, MIC_VIRTIO_RING_ALIGN));

	mpsslog("magic 0x%x expected 0x%x\n",

		vr0->info->magic, MIC_MAGIC + type);

	assert(vr0->info->magic == MIC_MAGIC + type);

		le32toh(vr0->info->magic), MIC_MAGIC + type);

	assert(le32toh(vr0->info->magic) == MIC_MAGIC + type);

	if (vr1) {

		vr1->va = (struct mic_vring *)

			&va[MIC_DEVICE_PAGE_END + vr_size];
@@ -458,8 +458,8 @@ init_vr(struct mic_info *mic, int fd, int type, 
			__func__, mic->name, vr1->va, vr1->info, vr_size,

			vring_size(MIC_VRING_ENTRIES, MIC_VIRTIO_RING_ALIGN));

		mpsslog("magic 0x%x expected 0x%x\n",

			vr1->info->magic, MIC_MAGIC + type + 1);

		assert(vr1->info->magic == MIC_MAGIC + type + 1);

			le32toh(vr1->info->magic), MIC_MAGIC + type + 1);

		assert(le32toh(vr1->info->magic) == MIC_MAGIC + type + 1);

	}

done:

	return va;
@@ -520,7 +520,7 @@ static void * 
virtio_net(void *arg)

{

	static __u8 vnet_hdr[2][sizeof(struct virtio_net_hdr)];

	static __u8 vnet_buf[2][MAX_NET_PKT_SIZE] __aligned(64);

	static __u8 vnet_buf[2][MAX_NET_PKT_SIZE] __attribute__ ((aligned(64)));

	struct iovec vnet_iov[2][2] = {

		{ { .iov_base = vnet_hdr[0], .iov_len = sizeof(vnet_hdr[0]) },

		  { .iov_base = vnet_buf[0], .iov_len = sizeof(vnet_buf[0]) } },
@@ -1412,6 +1412,12 @@ mic_config(void *arg) 
	}



	do {

		ret = lseek(fd, 0, SEEK_SET);

		if (ret < 0) {

			mpsslog("%s: Failed to seek to file start '%s': %s\n",

				mic->name, pathname, strerror(errno));

			goto close_error1;

		}

		ret = read(fd, value, sizeof(value));

		if (ret < 0) {

			mpsslog("%s: Failed to read sysfs entry '%s': %s\n",

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -4045,6 +4045,14 @@ W: http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi 
S:	Maintained

F:	fs/hpfs/



HSI SUBSYSTEM

M:	Sebastian Reichel <sre@debian.org>

S:	Maintained

F:	Documentation/ABI/testing/sysfs-bus-hsi

F:	drivers/hsi/

F:	include/linux/hsi/

F:	include/uapi/linux/hsi/



HSO 3G MODEM DRIVER

M:	Jan Dumon <j.dumon@option.com>

W:	http://www.pharscape.org

drivers/char/i8k.c

+7 −0
Original line number Diff line number Diff line
@@ -664,6 +664,13 @@ static struct dmi_system_id __initdata i8k_dmi_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "Vostro"),

		},

	},

	{

		.ident = "Dell XPS421",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "XPS L421X"),

		},

	},

        { }

};

drivers/extcon/extcon-arizona.c

+1 −3
Original line number Diff line number Diff line
@@ -1082,7 +1082,7 @@ static void arizona_micd_set_level(struct arizona *arizona, int index, 
static int arizona_extcon_probe(struct platform_device *pdev)

{

	struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);

	struct arizona_pdata *pdata;

	struct arizona_pdata *pdata = &arizona->pdata;

	struct arizona_extcon_info *info;

	unsigned int val;

	int jack_irq_fall, jack_irq_rise;
@@ -1091,8 +1091,6 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
	if (!arizona->dapm || !arizona->dapm->card)

		return -EPROBE_DEFER;



	pdata = dev_get_platdata(arizona->dev);



	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);

	if (!info) {

		dev_err(&pdev->dev, "Failed to allocate memory\n");