From eb8fafdfb9fce95b7d4f4bc9d34a46863176d7f8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Jan 2016 09:27:05 -0800 Subject: [PATCH] greybus: firmware: log the name of the firmware being requested People are getting confused as to what the firmware file name is for their module, so log it to make it easier to find modules with "blank" vid/pid values and let people know what to name their firmware files. Because we are now logging this, turn the debug message after the firmware request into an error message if something fails. Signed-off-by: Greg Kroah-Hartman Reviewed-by: Michael Scott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/firmware.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/staging/greybus/firmware.c b/drivers/staging/greybus/firmware.c index 408c7e2c0b08..6d8fd0ecbc1f 100644 --- a/drivers/staging/greybus/firmware.c +++ b/drivers/staging/greybus/firmware.c @@ -88,10 +88,19 @@ static int download_firmware(struct gb_firmware *firmware, u8 stage) intf->ddbl1_manufacturer_id, intf->ddbl1_product_id, firmware->vendor_id, firmware->product_id, stage); + // FIXME: + // Turn to dev_dbg later after everyone has valid bootloaders with good + // ids, but leave this as dev_info for now to make it easier to track + // down "empty" vid/pid modules. + dev_info(&connection->bundle->dev, "Firmware file '%s' requested\n", + firmware_name); + rc = request_firmware(&firmware->fw, firmware_name, &connection->bundle->dev); - dev_dbg(&connection->bundle->dev, "Searched for TFTF %s: %d\n", - firmware_name, rc); + if (rc) + dev_err(&connection->bundle->dev, + "Firware request for %s has failed : %d", + firmware_name, rc); return rc; } -- 2.39.2