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

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

Pull char/misc driver fixes from Greg KH:
 "Here are 4 small misc driver fixes for 5.7-rc3:

   - mei driver fix

   - interconnect driver fix

   - two fpga driver fixes

  All have been in linux-next with no reported issues"

* tag 'char-misc-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  interconnect: qcom: Fix uninitialized tcs_cmd::wait
  mei: me: fix irq number stored in hw struct
  fpga: dfl: pci: fix return value of cci_pci_sriov_configure
  fpga: zynq: Remove clk_get error message for probe defer
parents edf17b28 9c0c54a8

drivers/fpga/dfl-pci.c

+4 −2
Original line number Diff line number Diff line
@@ -248,11 +248,13 @@ static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs) 
			return ret;



		ret = pci_enable_sriov(pcidev, num_vfs);

		if (ret)

		if (ret) {

			dfl_fpga_cdev_config_ports_pf(cdev);

			return ret;

		}

	}



	return ret;

	return num_vfs;

}



static void cci_pci_remove(struct pci_dev *pcidev)

drivers/fpga/zynq-fpga.c

+2 −1
Original line number Diff line number Diff line
@@ -583,6 +583,7 @@ static int zynq_fpga_probe(struct platform_device *pdev) 


	priv->clk = devm_clk_get(dev, "ref_clk");

	if (IS_ERR(priv->clk)) {

		if (PTR_ERR(priv->clk) != -EPROBE_DEFER)

			dev_err(dev, "input clock not found\n");

		return PTR_ERR(priv->clk);

	}

drivers/interconnect/qcom/bcm-voter.c

+3 −2
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ static inline void tcs_cmd_gen(struct tcs_cmd *cmd, u64 vote_x, u64 vote_y, 
	if (!cmd)

		return;



	memset(cmd, 0, sizeof(*cmd));



	if (vote_x == 0 && vote_y == 0)

		valid = false;
@@ -112,8 +114,7 @@ static inline void tcs_cmd_gen(struct tcs_cmd *cmd, u64 vote_x, u64 vote_y, 
	 * Set the wait for completion flag on command that need to be completed

	 * before the next command.

	 */

	if (commit)

		cmd->wait = true;

	cmd->wait = commit;

}



static void tcs_list_gen(struct list_head *bcm_list, int bucket,

drivers/misc/mei/pci-me.c

+2 −1
Original line number Diff line number Diff line
@@ -203,11 +203,12 @@ static int mei_me_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}

	hw = to_me_hw(dev);

	hw->mem_addr = pcim_iomap_table(pdev)[0];

	hw->irq = pdev->irq;

	hw->read_fws = mei_me_read_fws;



	pci_enable_msi(pdev);



	hw->irq = pdev->irq;



	 /* request and enable interrupt */

	irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED;

CRA Git | Maintained and supported by SUSTech CRA and CCSE