Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7c35407 authored by Colin Ian King's avatar Colin Ian King Committed by Borislav Petkov
Browse files

EDAC, sb_edac: Remove NULL pointer check on array pci_tad 



pvt->pci_tad is a NUM_CHANNELS array of struct pci_dev pointers and
hence cannot be NULL, so the NULL pointer check on pci_tad is redundant.
Remove it.

Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/20160908083801.14766-1-colin.king@canonical.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 37209572

drivers/edac/sb_edac.c

+2 −3
Original line number Diff line number Diff line
@@ -2474,7 +2474,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, 


	/* Check if everything were registered */

	if (!pvt->pci_sad0 || !pvt->pci_sad1 || !pvt->pci_ha0 ||

	    !pvt-> pci_tad || !pvt->pci_ras  || !pvt->pci_ta)

	    !pvt->pci_ras || !pvt->pci_ta)

		goto enodev;



	if (saw_chan_mask != 0x0f)
@@ -2563,8 +2563,7 @@ static int ibridge_mci_bind_devs(struct mem_ctl_info *mci, 


	/* Check if everything were registered */

	if (!pvt->pci_sad0 || !pvt->pci_ha0 || !pvt->pci_br0 ||

	    !pvt->pci_br1 || !pvt->pci_tad || !pvt->pci_ras  ||

	    !pvt->pci_ta)

	    !pvt->pci_br1 || !pvt->pci_ras || !pvt->pci_ta)

		goto enodev;



	if (saw_chan_mask != 0x0f && /* -EN */