disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/net/fddi/defxx.c
..
..
@@ -627,7 +627,7 @@
627
627
 
628
628
 	/* Set up I/O base address. */
629
629
 	if (dfx_use_mmio) {
630
-		bp->base.mem = ioremap_nocache(bar_start[0], bar_len[0]);
630
+		bp->base.mem = ioremap(bar_start[0], bar_len[0]);
631
631
 		if (!bp->base.mem) {
632
632
 			printk(KERN_ERR "%s: Cannot map MMIO\n", print_name);
633
633
 			err = -ENOMEM;
..
..
@@ -1152,9 +1152,9 @@
1152
1152
 #endif
1153
1153
 					sizeof(PI_CONSUMER_BLOCK) +
1154
1154
 					(PI_ALIGN_K_DESC_BLK - 1);
1155
-	bp->kmalloced = top_v = dma_zalloc_coherent(bp->bus_dev, alloc_size,
1156
-						    &bp->kmalloced_dma,
1157
-						    GFP_ATOMIC);
1155
+	bp->kmalloced = top_v = dma_alloc_coherent(bp->bus_dev, alloc_size,
1156
+						   &bp->kmalloced_dma,
1157
+						   GFP_ATOMIC);
1158
1158
 	if (top_v == NULL)
1159
1159
 		return DFX_K_FAILURE;
1160
1160
 
..
..
@@ -3525,7 +3525,7 @@
3525
3525
 				 bp->descr_block_virt->xmt_data[comp].long_1,
3526
3526
 				 p_xmt_drv_descr->p_skb->len,
3527
3527
 				 DMA_TO_DEVICE);
3528
-		dev_kfree_skb_irq(p_xmt_drv_descr->p_skb);
3528
+		dev_consume_skb_irq(p_xmt_drv_descr->p_skb);
3529
3529
 
3530
3530
 		/*
3531
3531
 		 * Move to start of next packet by updating completion index
..
..
@@ -3844,10 +3844,24 @@
3844
3844
 	int status;
3845
3845
 
3846
3846
 	status = pci_register_driver(&dfx_pci_driver);
3847
-	if (!status)
3848
-		status = eisa_driver_register(&dfx_eisa_driver);
3849
-	if (!status)
3850
-		status = tc_register_driver(&dfx_tc_driver);
3847
+	if (status)
3848
+		goto err_pci_register;
3849
+
3850
+	status = eisa_driver_register(&dfx_eisa_driver);
3851
+	if (status)
3852
+		goto err_eisa_register;
3853
+
3854
+	status = tc_register_driver(&dfx_tc_driver);
3855
+	if (status)
3856
+		goto err_tc_register;
3857
+
3858
+	return 0;
3859
+
3860
+err_tc_register:
3861
+	eisa_driver_unregister(&dfx_eisa_driver);
3862
+err_eisa_register:
3863
+	pci_unregister_driver(&dfx_pci_driver);
3864
+err_pci_register:
3851
3865
 	return status;
3852
3866
 }
3853
3867