Commit 81a07617 authored by Niklas Schnelle's avatar Niklas Schnelle Committed by Heiko Carstens
Browse files

s390/pci: reset zdev->zbus on registration failure 



On failure to register a struct zpci_dev with a struct zpci_bus we left
a dangling pointer in zdev->zbus. As zpci_create_device() bails if
zpci_bus_device_register() fails this is of no consequence but still bad
practice.

Reviewed-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 02368b7c

arch/s390/pci/pci_bus.c

+2 −1
Original line number Diff line number Diff line
@@ -343,11 +343,11 @@ static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zdev) 
{

	int rc = -EINVAL;



	zdev->zbus = zbus;

	if (zbus->function[zdev->devfn]) {

		pr_err("devfn %04x is already assigned\n", zdev->devfn);

		return rc;

	}

	zdev->zbus = zbus;

	zbus->function[zdev->devfn] = zdev;

	zpci_nb_devices++;
@@ -367,6 +367,7 @@ static int zpci_bus_add_device(struct zpci_bus *zbus, struct zpci_dev *zdev) 


error:

	zbus->function[zdev->devfn] = NULL;

	zdev->zbus = NULL;

	zpci_nb_devices--;

	return rc;

}