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

Unverified Commit 27f794ab authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.265 kernel 

Changes in 4.4.265: (29 commits)
        selinux: vsock: Set SID for socket returned by accept()
        ipv6: weaken the v4mapped source check
        ext4: fix bh ref count on error paths
        rpc: fix NULL dereference on kmalloc failure
        ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10
        ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor of 10
        ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe
        scsi: st: Fix a use after free in st_open()
        scsi: qla2xxx: Fix broken #endif placement
        staging: comedi: cb_pcidas: fix request_irq() warn
        staging: comedi: cb_pcidas64: fix request_irq() warn
        ext4: do not iput inode under running transaction in ext4_rename()
        appletalk: Fix skb allocation size in loopback case
        net: wan/lmc: unregister device when no matching device is found
        ALSA: usb-audio: Apply sample rate quirk to Logitech Connect
        ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook
        tracing: Fix stack trace event size
        mm: fix race by making init_zero_pfn() early_initcall
        reiserfs: update reiserfs_xattrs_initialized() condition
        pinctrl: rockchip: fix restore error in resume
        extcon: Fix error handling in extcon_dev_register
        firewire: nosy: Fix a use-after-free bug in nosy_ioctl()
        USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem
        cdc-acm: fix BREAK rx code path adding necessary calls
        USB: cdc-acm: downgrade message to debug
        USB: cdc-acm: fix use-after-free after probe failure
        staging: rtl8192e: Fix incorrect source in memcpy()
        staging: rtl8192e: Change state information from u16 to u8
        Linux 4.4.265
parents 000abc8d a0c64682

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 264

SUBLEVEL = 265

EXTRAVERSION =

NAME = Blurry Fish Butt

drivers/extcon/extcon.c

+1 −0
Original line number Diff line number Diff line
@@ -945,6 +945,7 @@ int extcon_dev_register(struct extcon_dev *edev) 
			sizeof(*edev->nh) * edev->max_supported, GFP_KERNEL);

	if (!edev->nh) {

		ret = -ENOMEM;

		device_unregister(&edev->dev);

		goto err_dev;

	}

drivers/firewire/nosy.c

+7 −2
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ nosy_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	struct client *client = file->private_data;

	spinlock_t *client_list_lock = &client->lynx->client_list_lock;

	struct nosy_stats stats;

	int ret;



	switch (cmd) {

	case NOSY_IOC_GET_STATS:
@@ -372,11 +373,15 @@ nosy_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
			return 0;



	case NOSY_IOC_START:

		ret = -EBUSY;

		spin_lock_irq(client_list_lock);

		if (list_empty(&client->link)) {

			list_add_tail(&client->link, &client->lynx->client_list);

			ret = 0;

		}

		spin_unlock_irq(client_list_lock);



		return 0;

		return ret;



	case NOSY_IOC_STOP:

		spin_lock_irq(client_list_lock);

drivers/net/wan/lmc/lmc_main.c

+2 −0
Original line number Diff line number Diff line
@@ -926,6 +926,8 @@ static int lmc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
        break;

    default:

	printk(KERN_WARNING "%s: LMC UNKNOWN CARD!\n", dev->name);

	unregister_hdlc_device(dev);

	return -EIO;

        break;

    }

drivers/pinctrl/pinctrl-rockchip.c

+8 −5
Original line number Diff line number Diff line
@@ -1967,12 +1967,15 @@ static int __maybe_unused rockchip_pinctrl_suspend(struct device *dev) 
static int __maybe_unused rockchip_pinctrl_resume(struct device *dev)

{

	struct rockchip_pinctrl *info = dev_get_drvdata(dev);

	int ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX,

	int ret;



	if (info->ctrl->type == RK3288) {

		ret = regmap_write(info->regmap_base, RK3288_GRF_GPIO6C_IOMUX,

				   rk3288_grf_gpio6c_iomux |

				   GPIO6C6_SEL_WRITE_ENABLE);



		if (ret)

			return ret;

	}



	return pinctrl_force_default(info->pctl_dev);

}