X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=drivers%2Ffirmware%2Farm_scmi%2Fbus.c;h=6c7e24935eca58b4ce0e04c8a33f234078ae6284;hb=d842bc6c0579ca7643eed029beabab3ac562a335;hp=784cf0027da3c5a95923f59fc1b9dc99ab8f98b3;hpb=e22e9832798df81393d09d40fa34b01aea53cf39;p=linux-2.6-microblaze.git

diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c
index 784cf0027da3..6c7e24935eca 100644
--- a/drivers/firmware/arm_scmi/bus.c
+++ b/drivers/firmware/arm_scmi/bus.c
@@ -104,11 +104,6 @@ static int scmi_dev_probe(struct device *dev)
 {
 	struct scmi_driver *scmi_drv = to_scmi_driver(dev->driver);
 	struct scmi_device *scmi_dev = to_scmi_dev(dev);
-	const struct scmi_device_id *id;
-
-	id = scmi_dev_match_id(scmi_dev, scmi_drv);
-	if (!id)
-		return -ENODEV;
 
 	if (!scmi_dev->handle)
 		return -EPROBE_DEFER;
@@ -139,6 +134,9 @@ int scmi_driver_register(struct scmi_driver *driver, struct module *owner,
 {
 	int retval;
 
+	if (!driver->probe)
+		return -EINVAL;
+
 	retval = scmi_protocol_device_request(driver->id_table);
 	if (retval)
 		return retval;