Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+11
-6
+4
-2
drivers/fpga/dfl-pci.c
+4
-2
drivers/fpga/dfl-pci.c
···
248
248
return ret;
249
249
250
250
ret = pci_enable_sriov(pcidev, num_vfs);
251
-
if (ret)
251
+
if (ret) {
252
252
dfl_fpga_cdev_config_ports_pf(cdev);
253
+
return ret;
254
+
}
253
255
}
254
256
255
-
return ret;
257
+
return num_vfs;
256
258
}
257
259
258
260
static void cci_pci_remove(struct pci_dev *pcidev)
+2
-1
drivers/fpga/zynq-fpga.c
+2
-1
drivers/fpga/zynq-fpga.c
+3
-2
drivers/interconnect/qcom/bcm-voter.c
+3
-2
drivers/interconnect/qcom/bcm-voter.c
···
96
96
if (!cmd)
97
97
return;
98
98
99
+
memset(cmd, 0, sizeof(*cmd));
100
+
99
101
if (vote_x == 0 && vote_y == 0)
100
102
valid = false;
101
103
···
114
112
* Set the wait for completion flag on command that need to be completed
115
113
* before the next command.
116
114
*/
117
-
if (commit)
118
-
cmd->wait = true;
115
+
cmd->wait = commit;
119
116
}
120
117
121
118
static void tcs_list_gen(struct list_head *bcm_list, int bucket,
+2
-1
drivers/misc/mei/pci-me.c
+2
-1
drivers/misc/mei/pci-me.c
···
203
203
}
204
204
hw = to_me_hw(dev);
205
205
hw->mem_addr = pcim_iomap_table(pdev)[0];
206
-
hw->irq = pdev->irq;
207
206
hw->read_fws = mei_me_read_fws;
208
207
209
208
pci_enable_msi(pdev);
209
+
210
+
hw->irq = pdev->irq;
210
211
211
212
/* request and enable interrupt */
212
213
irqflags = pci_dev_msi_enabled(pdev) ? IRQF_ONESHOT : IRQF_SHARED;