From 86ea8acc6b494dbadd16a82ed778a68d5b4d4091 Mon Sep 17 00:00:00 2001 From: David Kershner Date: Fri, 12 Jun 2015 16:46:08 -0400 Subject: [PATCH] staging: unisys: Don't hold device responses until driver loads Currently if a driver is not loaded for a device, we will not respond to the device create until it is done. This causes s-Par to not mark the partition running if the driver for the device is not loaded. Since there are several devices that could be assigned to a guest that don't have an actual driver this will cause us to never go running. If the device driver is loaded, we WILL continue to only respond to the device PAUSE message when the device driver has responded that it is done with the device. Signed-off-by: David Kershner Signed-off-by: Greg Kroah-Hartman --- .../staging/unisys/visorbus/visorbus_main.c | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/drivers/staging/unisys/visorbus/visorbus_main.c b/drivers/staging/unisys/visorbus/visorbus_main.c index 6fa17eadc306..6db47196c189 100644 --- a/drivers/staging/unisys/visorbus/visorbus_main.c +++ b/drivers/staging/unisys/visorbus/visorbus_main.c @@ -70,7 +70,6 @@ static const struct attribute_group *visorbus_bus_groups[] = { NULL, }; - /** This describes the TYPE of bus. * (Don't confuse this with an INSTANCE of the bus.) */ @@ -745,19 +744,6 @@ visordriver_probe_device(struct device *xdev) away: if (rc != 0) put_device(&dev->device); - /* We could get here more than once if the child driver module is - * unloaded and re-loaded while devices are present. That's why we - * need a flag to be sure that we only respond to the device_create - * once. We cannot respond to the device_create prior to here, - * because until we call drv->probe() above, the channel has not been - * initialized. - */ - if (!dev->responded_to_device_create) { - - dev->responded_to_device_create = true; - if (chipset_responders.device_create) - (*chipset_responders.device_create)(dev, rc); - } return rc; } @@ -1305,15 +1291,15 @@ chipset_device_create(struct visor_device *dev_info) POSTCODE_SEVERITY_INFO); rc = create_visor_device(dev_info); - if (rc < 0) { + if (chipset_responders.device_create) + chipset_responders.device_create(dev_info, rc); + + if (rc < 0) POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no, POSTCODE_SEVERITY_ERR); - if (chipset_responders.device_create) - (*chipset_responders.device_create)(dev_info, rc); - } - - POSTCODE_LINUX_4(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no, - POSTCODE_SEVERITY_INFO); + else + POSTCODE_LINUX_4(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no, + POSTCODE_SEVERITY_INFO); } static void -- 2.34.1