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

Unverified Commit a94fbd79 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.250 kernel 

Changes in 4.4.250: (21 commits)
        ALSA: hda/ca0132 - Fix work handling in delayed HP detection
        ALSA: usb-audio: simplify set_sync_ep_implicit_fb_quirk
        ALSA: usb-audio: fix sync-ep altsetting sanity check
        ALSA: hda/realtek - Support Dell headset mode for ALC3271
        ALSA: hda - Fix a wrong FIXUP for alc289 on Dell machines
        ALSA: hda/realtek - Dell headphone has noise on unmute for ALC236
        s390/dasd: fix hanging device offline processing
        USB: serial: digi_acceleport: fix write-wakeup deadlocks
        uapi: move constants from <linux/kernel.h> to <linux/const.h>
        of: fix linker-section match-table corruption
        reiserfs: add check for an invalid ih_entry_count
        misc: vmw_vmci: fix kernel info-leak by initializing dbells in vmci_ctx_get_chkpt_doorbells()
        media: gp8psk: initialize stats at power control logic
        ALSA: seq: Use bool for snd_seq_queue internal flags
        module: set MODULE_STATE_GOING state when a module fails to load
        quota: Don't overflow quota file offsets
        powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe()
        module: delay kobject uevent until after module init call
        iio:magnetometer:mag3110: Fix alignment and data leak issues.
        mwifiex: Fix possible buffer overflows in mwifiex_cmd_802_11_ad_hoc_start
        Linux 4.4.250
parents 8dc5886c 26adb9d8

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 249

SUBLEVEL = 250

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/powerpc/sysdev/mpic_msgr.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int mpic_msgr_probe(struct platform_device *dev) 


	/* IO map the message register block. */

	of_address_to_resource(np, 0, &rsrc);

	msgr_block_addr = ioremap(rsrc.start, resource_size(&rsrc));

	msgr_block_addr = devm_ioremap(&dev->dev, rsrc.start, resource_size(&rsrc));

	if (!msgr_block_addr) {

		dev_err(&dev->dev, "Failed to iomap MPIC message registers");

		return -EFAULT;

drivers/iio/magnetometer/mag3110.c

+9 −4
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ struct mag3110_data { 
	struct i2c_client *client;

	struct mutex lock;

	u8 ctrl_reg1;

	/* Ensure natural alignment of timestamp */

	struct {

		__be16 channels[3];

		u8 temperature;

		s64 ts __aligned(8);

	} scan;

};



static int mag3110_request(struct mag3110_data *data)
@@ -245,10 +251,9 @@ static irqreturn_t mag3110_trigger_handler(int irq, void *p) 
	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->indio_dev;

	struct mag3110_data *data = iio_priv(indio_dev);

	u8 buffer[16]; /* 3 16-bit channels + 1 byte temp + padding + ts */

	int ret;



	ret = mag3110_read(data, (__be16 *) buffer);

	ret = mag3110_read(data, data->scan.channels);

	if (ret < 0)

		goto done;
@@ -257,10 +262,10 @@ static irqreturn_t mag3110_trigger_handler(int irq, void *p) 
			MAG3110_DIE_TEMP);

		if (ret < 0)

			goto done;

		buffer[6] = ret;

		data->scan.temperature = ret;

	}



	iio_push_to_buffers_with_timestamp(indio_dev, buffer,

	iio_push_to_buffers_with_timestamp(indio_dev, &data->scan,

		iio_get_time_ns());



done:

drivers/media/usb/dvb-usb/gp8psk.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ out_rel_fw: 


static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff)

{

	u8 status, buf;

	u8 status = 0, buf;

	int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct);



	if (onoff) {

drivers/misc/vmw_vmci/vmci_context.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int vmci_ctx_get_chkpt_doorbells(struct vmci_ctx *context, 
			return VMCI_ERROR_MORE_DATA;

		}



		dbells = kmalloc(data_size, GFP_ATOMIC);

		dbells = kzalloc(data_size, GFP_ATOMIC);

		if (!dbells)

			return VMCI_ERROR_NO_MEM;