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

Commit a7dee8f4 authored by James Bottomley's avatar James Bottomley
Browse files

Merge branch 'fixes' into misc

parents 7ee7895c 5ecee0a3

drivers/md/dm.c

+2 −0
Original line number Diff line number Diff line
@@ -1191,6 +1191,8 @@ static void dm_unprep_request(struct request *rq) 


	if (clone)

		free_rq_clone(clone);

	else if (!tio->md->queue->mq_ops)

		free_rq_tio(tio);

}



/*

drivers/mmc/host/omap_hsmmc.c

+2 −0
Original line number Diff line number Diff line
@@ -2232,6 +2232,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) 
		dma_release_channel(host->tx_chan);

	if (host->rx_chan)

		dma_release_channel(host->rx_chan);

	pm_runtime_dont_use_autosuspend(host->dev);

	pm_runtime_put_sync(host->dev);

	pm_runtime_disable(host->dev);

	if (host->dbclk)
@@ -2253,6 +2254,7 @@ static int omap_hsmmc_remove(struct platform_device *pdev) 
	dma_release_channel(host->tx_chan);

	dma_release_channel(host->rx_chan);



	pm_runtime_dont_use_autosuspend(host->dev);

	pm_runtime_put_sync(host->dev);

	pm_runtime_disable(host->dev);

	device_init_wakeup(&pdev->dev, false);

drivers/scsi/be2iscsi/be_main.c

+1 −0
Original line number Diff line number Diff line
@@ -4493,6 +4493,7 @@ static int beiscsi_setup_boot_info(struct beiscsi_hba *phba) 
	scsi_host_put(phba->shost);

free_kset:

	iscsi_boot_destroy_kset(phba->boot_kset);

	phba->boot_kset = NULL;

	return -ENOMEM;

}

drivers/scsi/ipr.c

+5 −0
Original line number Diff line number Diff line
@@ -4002,6 +4002,7 @@ static ssize_t ipr_store_update_fw(struct device *dev, 
	struct ipr_sglist *sglist;

	char fname[100];

	char *src;

	char *endline;

	int result, dnld_size;



	if (!capable(CAP_SYS_ADMIN))
@@ -4009,6 +4010,10 @@ static ssize_t ipr_store_update_fw(struct device *dev, 


	snprintf(fname, sizeof(fname), "%s", buf);



	endline = strchr(fname, '\n');

	if (endline)

		*endline = '\0';



	if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) {

		dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname);

		return -EIO;

drivers/scsi/scsi_lib.c

+1 −0
Original line number Diff line number Diff line
@@ -1344,6 +1344,7 @@ scsi_prep_return(struct request_queue *q, struct request *req, int ret) 


	switch (ret) {

	case BLKPREP_KILL:

	case BLKPREP_INVALID:

		req->errors = DID_NO_CONNECT << 16;

		/* release the command and kill it */

		if (req->special) {