tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull char/misc driver fixes from Greg KH:
"Here are a few small driver char/misc changes for 5.12-rc6.

Nothing major here, a few fixes for reported issues:

- interconnect fixes for problems found

- fbcon syzbot-found fix

- extcon fixes

- firmware stratix10 bugfix

- MAINTAINERS file update.

All of these have been in linux-next for a while with no reported
issues"

* tag 'char-misc-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
drivers: video: fbcon: fix NULL dereference in fbcon_cursor()
mei: allow map and unmap of client dma buffer only for disconnected client
MAINTAINERS: Add linux-phy list and patchwork
interconnect: Fix kerneldoc warning
firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0
extcon: Fix error handling in extcon_dev_register
extcon: Add stubs for extcon_register_notifier_all() functions
interconnect: core: fix error return code of icc_link_destroy()
interconnect: qcom: msm8939: remove rpm-ids from non-RPM nodes

Linus Torvalds a443930a 3e707eb6

+48 -21
+2 -1
MAINTAINERS
··· 7474 7474 GENERIC PHY FRAMEWORK 7475 7475 M: Kishon Vijay Abraham I <kishon@ti.com> 7476 7476 M: Vinod Koul <vkoul@kernel.org> 7477 - L: linux-kernel@vger.kernel.org 7477 + L: linux-phy@lists.infradead.org 7478 7478 S: Supported 7479 + Q: https://patchwork.kernel.org/project/linux-phy/list/ 7479 7480 T: git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git 7480 7481 F: Documentation/devicetree/bindings/phy/ 7481 7482 F: drivers/phy/
+1
drivers/extcon/extcon.c
··· 1241 1241 sizeof(*edev->nh), GFP_KERNEL); 1242 1242 if (!edev->nh) { 1243 1243 ret = -ENOMEM; 1244 + device_unregister(&edev->dev); 1244 1245 goto err_dev; 1245 1246 } 1246 1247
+1 -1
drivers/interconnect/bulk.c
··· 53 53 EXPORT_SYMBOL_GPL(icc_bulk_put); 54 54 55 55 /** 56 - * icc_bulk_set() - set bandwidth to a set of paths 56 + * icc_bulk_set_bw() - set bandwidth to a set of paths 57 57 * @num_paths: the number of icc_bulk_data 58 58 * @paths: the icc_bulk_data table containing the paths and bandwidth 59 59 *
+2
drivers/interconnect/core.c
··· 942 942 GFP_KERNEL); 943 943 if (new) 944 944 src->links = new; 945 + else 946 + ret = -ENOMEM; 945 947 946 948 out: 947 949 mutex_unlock(&icc_lock);
+8 -8
drivers/interconnect/qcom/msm8939.c
··· 131 131 DEFINE_QNODE(mas_pcnoc_sdcc_2, MSM8939_MASTER_SDCC_2, 8, -1, -1, MSM8939_PNOC_INT_1); 132 132 DEFINE_QNODE(mas_qdss_bam, MSM8939_MASTER_QDSS_BAM, 8, -1, -1, MSM8939_SNOC_QDSS_INT); 133 133 DEFINE_QNODE(mas_qdss_etr, MSM8939_MASTER_QDSS_ETR, 8, -1, -1, MSM8939_SNOC_QDSS_INT); 134 - DEFINE_QNODE(mas_snoc_cfg, MSM8939_MASTER_SNOC_CFG, 4, 20, -1, MSM8939_SLAVE_SRVC_SNOC); 134 + DEFINE_QNODE(mas_snoc_cfg, MSM8939_MASTER_SNOC_CFG, 4, -1, -1, MSM8939_SLAVE_SRVC_SNOC); 135 135 DEFINE_QNODE(mas_spdm, MSM8939_MASTER_SPDM, 4, -1, -1, MSM8939_PNOC_MAS_0); 136 136 DEFINE_QNODE(mas_tcu0, MSM8939_MASTER_TCU0, 16, -1, -1, MSM8939_SLAVE_EBI_CH0, MSM8939_BIMC_SNOC_MAS, MSM8939_SLAVE_AMPSS_L2); 137 137 DEFINE_QNODE(mas_usb_hs1, MSM8939_MASTER_USB_HS1, 4, -1, -1, MSM8939_PNOC_MAS_1); ··· 156 156 DEFINE_QNODE(pcnoc_snoc_slv, MSM8939_PNOC_SNOC_SLV, 8, -1, 45, MSM8939_SNOC_INT_0, MSM8939_SNOC_INT_BIMC, MSM8939_SNOC_INT_1); 157 157 DEFINE_QNODE(qdss_int, MSM8939_SNOC_QDSS_INT, 8, -1, -1, MSM8939_SNOC_INT_0, MSM8939_SNOC_INT_BIMC); 158 158 DEFINE_QNODE(slv_apps_l2, MSM8939_SLAVE_AMPSS_L2, 16, -1, -1, 0); 159 - DEFINE_QNODE(slv_apss, MSM8939_SLAVE_APSS, 4, -1, 20, 0); 159 + DEFINE_QNODE(slv_apss, MSM8939_SLAVE_APSS, 4, -1, -1, 0); 160 160 DEFINE_QNODE(slv_audio, MSM8939_SLAVE_LPASS, 4, -1, -1, 0); 161 161 DEFINE_QNODE(slv_bimc_cfg, MSM8939_SLAVE_BIMC_CFG, 4, -1, -1, 0); 162 162 DEFINE_QNODE(slv_blsp_1, MSM8939_SLAVE_BLSP_1, 4, -1, -1, 0); 163 163 DEFINE_QNODE(slv_boot_rom, MSM8939_SLAVE_BOOT_ROM, 4, -1, -1, 0); 164 164 DEFINE_QNODE(slv_camera_cfg, MSM8939_SLAVE_CAMERA_CFG, 4, -1, -1, 0); 165 - DEFINE_QNODE(slv_cats_0, MSM8939_SLAVE_CATS_128, 16, -1, 106, 0); 166 - DEFINE_QNODE(slv_cats_1, MSM8939_SLAVE_OCMEM_64, 8, -1, 107, 0); 165 + DEFINE_QNODE(slv_cats_0, MSM8939_SLAVE_CATS_128, 16, -1, -1, 0); 166 + DEFINE_QNODE(slv_cats_1, MSM8939_SLAVE_OCMEM_64, 8, -1, -1, 0); 167 167 DEFINE_QNODE(slv_clk_ctl, MSM8939_SLAVE_CLK_CTL, 4, -1, -1, 0); 168 168 DEFINE_QNODE(slv_crypto_0_cfg, MSM8939_SLAVE_CRYPTO_0_CFG, 4, -1, -1, 0); 169 169 DEFINE_QNODE(slv_dehr_cfg, MSM8939_SLAVE_DEHR_CFG, 4, -1, -1, 0); ··· 187 187 DEFINE_QNODE(slv_security, MSM8939_SLAVE_SECURITY, 4, -1, -1, 0); 188 188 DEFINE_QNODE(slv_snoc_cfg, MSM8939_SLAVE_SNOC_CFG, 4, -1, -1, 0); 189 189 DEFINE_QNODE(slv_spdm, MSM8939_SLAVE_SPDM, 4, -1, -1, 0); 190 - DEFINE_QNODE(slv_srvc_snoc, MSM8939_SLAVE_SRVC_SNOC, 8, -1, 29, 0); 190 + DEFINE_QNODE(slv_srvc_snoc, MSM8939_SLAVE_SRVC_SNOC, 8, -1, -1, 0); 191 191 DEFINE_QNODE(slv_tcsr, MSM8939_SLAVE_TCSR, 4, -1, -1, 0); 192 192 DEFINE_QNODE(slv_tlmm, MSM8939_SLAVE_TLMM, 4, -1, -1, 0); 193 193 DEFINE_QNODE(slv_usb_hs1, MSM8939_SLAVE_USB_HS1, 4, -1, -1, 0); 194 194 DEFINE_QNODE(slv_usb_hs2, MSM8939_SLAVE_USB_HS2, 4, -1, -1, 0); 195 195 DEFINE_QNODE(slv_venus_cfg, MSM8939_SLAVE_VENUS_CFG, 4, -1, -1, 0); 196 - DEFINE_QNODE(snoc_bimc_0_mas, MSM8939_SNOC_BIMC_0_MAS, 16, 3, -1, MSM8939_SNOC_BIMC_0_SLV); 197 - DEFINE_QNODE(snoc_bimc_0_slv, MSM8939_SNOC_BIMC_0_SLV, 16, -1, 24, MSM8939_SLAVE_EBI_CH0); 196 + DEFINE_QNODE(snoc_bimc_0_mas, MSM8939_SNOC_BIMC_0_MAS, 16, -1, -1, MSM8939_SNOC_BIMC_0_SLV); 197 + DEFINE_QNODE(snoc_bimc_0_slv, MSM8939_SNOC_BIMC_0_SLV, 16, -1, -1, MSM8939_SLAVE_EBI_CH0); 198 198 DEFINE_QNODE(snoc_bimc_1_mas, MSM8939_SNOC_BIMC_1_MAS, 16, 76, -1, MSM8939_SNOC_BIMC_1_SLV); 199 199 DEFINE_QNODE(snoc_bimc_1_slv, MSM8939_SNOC_BIMC_1_SLV, 16, -1, 104, MSM8939_SLAVE_EBI_CH0); 200 200 DEFINE_QNODE(snoc_bimc_2_mas, MSM8939_SNOC_BIMC_2_MAS, 16, -1, -1, MSM8939_SNOC_BIMC_2_SLV); 201 201 DEFINE_QNODE(snoc_bimc_2_slv, MSM8939_SNOC_BIMC_2_SLV, 16, -1, -1, MSM8939_SLAVE_EBI_CH0); 202 202 DEFINE_QNODE(snoc_int_0, MSM8939_SNOC_INT_0, 8, 99, 130, MSM8939_SLAVE_QDSS_STM, MSM8939_SLAVE_IMEM, MSM8939_SNOC_PNOC_MAS); 203 - DEFINE_QNODE(snoc_int_1, MSM8939_SNOC_INT_1, 8, 100, 131, MSM8939_SLAVE_APSS, MSM8939_SLAVE_CATS_128, MSM8939_SLAVE_OCMEM_64); 203 + DEFINE_QNODE(snoc_int_1, MSM8939_SNOC_INT_1, 8, -1, -1, MSM8939_SLAVE_APSS, MSM8939_SLAVE_CATS_128, MSM8939_SLAVE_OCMEM_64); 204 204 DEFINE_QNODE(snoc_int_bimc, MSM8939_SNOC_INT_BIMC, 8, 101, 132, MSM8939_SNOC_BIMC_1_MAS); 205 205 DEFINE_QNODE(snoc_pcnoc_mas, MSM8939_SNOC_PNOC_MAS, 8, -1, -1, MSM8939_SNOC_PNOC_SLV); 206 206 DEFINE_QNODE(snoc_pcnoc_slv, MSM8939_SNOC_PNOC_SLV, 8, -1, -1, MSM8939_PNOC_INT_0);
+7 -10
drivers/misc/mei/client.c
··· 2286 2286 if (buffer_id == 0) 2287 2287 return -EINVAL; 2288 2288 2289 - if (!mei_cl_is_connected(cl)) 2290 - return -ENODEV; 2289 + if (mei_cl_is_connected(cl)) 2290 + return -EPROTO; 2291 2291 2292 2292 if (cl->dma_mapped) 2293 2293 return -EPROTO; ··· 2327 2327 2328 2328 mutex_unlock(&dev->device_lock); 2329 2329 wait_event_timeout(cl->wait, 2330 - cl->dma_mapped || 2331 - cl->status || 2332 - !mei_cl_is_connected(cl), 2330 + cl->dma_mapped || cl->status, 2333 2331 mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT)); 2334 2332 mutex_lock(&dev->device_lock); 2335 2333 ··· 2374 2376 return -EOPNOTSUPP; 2375 2377 } 2376 2378 2377 - if (!mei_cl_is_connected(cl)) 2378 - return -ENODEV; 2379 + /* do not allow unmap for connected client */ 2380 + if (mei_cl_is_connected(cl)) 2381 + return -EPROTO; 2379 2382 2380 2383 if (!cl->dma_mapped) 2381 2384 return -EPROTO; ··· 2404 2405 2405 2406 mutex_unlock(&dev->device_lock); 2406 2407 wait_event_timeout(cl->wait, 2407 - !cl->dma_mapped || 2408 - cl->status || 2409 - !mei_cl_is_connected(cl), 2408 + !cl->dma_mapped || cl->status, 2410 2409 mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT)); 2411 2410 mutex_lock(&dev->device_lock); 2412 2411
+3
drivers/video/fbdev/core/fbcon.c
··· 1333 1333 1334 1334 ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1; 1335 1335 1336 + if (!ops->cursor) 1337 + return; 1338 + 1336 1339 ops->cursor(vc, info, mode, get_color(vc, info, c, 1), 1337 1340 get_color(vc, info, c, 0)); 1338 1341 }
+23
include/linux/extcon.h
··· 271 271 struct extcon_dev *edev, unsigned int id, 272 272 struct notifier_block *nb) { } 273 273 274 + static inline int extcon_register_notifier_all(struct extcon_dev *edev, 275 + struct notifier_block *nb) 276 + { 277 + return 0; 278 + } 279 + 280 + static inline int extcon_unregister_notifier_all(struct extcon_dev *edev, 281 + struct notifier_block *nb) 282 + { 283 + return 0; 284 + } 285 + 286 + static inline int devm_extcon_register_notifier_all(struct device *dev, 287 + struct extcon_dev *edev, 288 + struct notifier_block *nb) 289 + { 290 + return 0; 291 + } 292 + 293 + static inline void devm_extcon_unregister_notifier_all(struct device *dev, 294 + struct extcon_dev *edev, 295 + struct notifier_block *nb) { } 296 + 274 297 static inline struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name) 275 298 { 276 299 return ERR_PTR(-ENODEV);
+1 -1
include/linux/firmware/intel/stratix10-svc-client.h
··· 56 56 * COMMAND_RECONFIG_FLAG_PARTIAL: 57 57 * Set to FPGA configuration type (full or partial). 58 58 */ 59 - #define COMMAND_RECONFIG_FLAG_PARTIAL 1 59 + #define COMMAND_RECONFIG_FLAG_PARTIAL 0 60 60 61 61 /* 62 62 * Timeout settings for service clients: