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

Commit d39fc1d1 authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.147 kernel

parents 554338ec bcb72e32

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 146

SUBLEVEL = 147

EXTRAVERSION =

NAME = Blurry Fish Butt

drivers/i2c/busses/i2c-imx.c

+1 −2
Original line number Diff line number Diff line
@@ -382,6 +382,7 @@ static int i2c_imx_dma_xfer(struct imx_i2c_struct *i2c_imx, 
		goto err_desc;

	}



	reinit_completion(&dma->cmd_complete);

	txdesc->callback = i2c_imx_dma_callback;

	txdesc->callback_param = i2c_imx;

	if (dma_submit_error(dmaengine_submit(txdesc))) {
@@ -631,7 +632,6 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx, 
	 * The first byte must be transmitted by the CPU.

	 */

	imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR);

	reinit_completion(&i2c_imx->dma->cmd_complete);

	time_left = wait_for_completion_timeout(

				&i2c_imx->dma->cmd_complete,

				msecs_to_jiffies(DMA_TIMEOUT));
@@ -690,7 +690,6 @@ static int i2c_imx_dma_read(struct imx_i2c_struct *i2c_imx, 
	if (result)

		return result;



	reinit_completion(&i2c_imx->dma->cmd_complete);

	time_left = wait_for_completion_timeout(

				&i2c_imx->dma->cmd_complete,

				msecs_to_jiffies(DMA_TIMEOUT));

drivers/pci/pci-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ void acpi_pci_add_bus(struct pci_bus *bus) 
	union acpi_object *obj;

	struct pci_host_bridge *bridge;



	if (acpi_pci_disabled || !bus->bridge)

	if (acpi_pci_disabled || !bus->bridge || !ACPI_HANDLE(bus->bridge))

		return;



	acpi_pci_slot_enumerate(bus);

drivers/scsi/qla2xxx/qla_init.c

+3 −4
Original line number Diff line number Diff line
@@ -325,11 +325,10 @@ qla2x00_async_tm_cmd(fc_port_t *fcport, uint32_t flags, uint32_t lun, 


	wait_for_completion(&tm_iocb->u.tmf.comp);



	rval = tm_iocb->u.tmf.comp_status == CS_COMPLETE ?

	    QLA_SUCCESS : QLA_FUNCTION_FAILED;

	rval = tm_iocb->u.tmf.data;



	if ((rval != QLA_SUCCESS) || tm_iocb->u.tmf.data) {

		ql_dbg(ql_dbg_taskm, vha, 0x8030,

	if (rval != QLA_SUCCESS) {

		ql_log(ql_log_warn, vha, 0x8030,

		    "TM IOCB failed (%x).\n", rval);

	}

drivers/scsi/qla2xxx/qla_os.c

+3 −2
Original line number Diff line number Diff line
@@ -4938,8 +4938,9 @@ qla2x00_do_dpc(void *data) 
			}

		}



		if (test_and_clear_bit(ISP_ABORT_NEEDED,

						&base_vha->dpc_flags)) {

		if (test_and_clear_bit

		    (ISP_ABORT_NEEDED, &base_vha->dpc_flags) &&

		    !test_bit(UNLOADING, &base_vha->dpc_flags)) {



			ql_dbg(ql_dbg_dpc, base_vha, 0x4007,

			    "ISP abort scheduled.\n");