hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/drivers/net/ethernet/sun/cassini.c
....@@ -1325,7 +1325,7 @@
13251325 writel(val, cp->regs + REG_RX_PAGE_SIZE);
13261326
13271327 /* enable the header parser if desired */
1328
- if (CAS_HP_FIRMWARE == cas_prog_null)
1328
+ if (&CAS_HP_FIRMWARE[0] == &cas_prog_null[0])
13291329 return;
13301330
13311331 val = CAS_BASE(HP_CFG_NUM_CPU, CAS_NCPUS > 63 ? 0 : CAS_NCPUS);
....@@ -3793,7 +3793,7 @@
37933793
37943794 /* program header parser */
37953795 if ((cp->cas_flags & CAS_FLAG_TARGET_ABORT) ||
3796
- (CAS_HP_ALT_FIRMWARE == cas_prog_null)) {
3796
+ (&CAS_HP_ALT_FIRMWARE[0] == &cas_prog_null[0])) {
37973797 cas_load_firmware(cp, CAS_HP_FIRMWARE);
37983798 } else {
37993799 cas_load_firmware(cp, CAS_HP_ALT_FIRMWARE);
....@@ -5122,6 +5122,8 @@
51225122 cas_shutdown(cp);
51235123 mutex_unlock(&cp->pm_mutex);
51245124
5125
+ vfree(cp->fw_data);
5126
+
51255127 pci_iounmap(pdev, cp->regs);
51265128
51275129