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

Commit d2ace29f authored by Stefan Richter's avatar Stefan Richter
Browse files

ieee1394: prevent device binding of raw1394, video1394, dv1394 



These drivers don't need to match any unit_directory type device.
They just need the id_table for module autoloading per module alias.

Not binding any of these drivers allows special-purpose drivers with
similar or same IDs to bind to devices.  This currently only benefits
out-of-tree drivers; on the other hand it is in no way detrimental to
in-tree drivers.

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent 63995d46

drivers/ieee1394/dv1394.c

+1 −2
Original line number Diff line number Diff line
@@ -2180,7 +2180,6 @@ MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 


static struct hpsb_protocol_driver dv1394_driver = {

	.name = "dv1394",

	.id_table	= dv1394_id_table,

};

drivers/ieee1394/nodemgr.c

+5 −1
Original line number Diff line number Diff line
@@ -701,7 +701,11 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv) 
		return 0;



	driver = container_of(drv, struct hpsb_protocol_driver, driver);

	for (id = driver->id_table; id->match_flags != 0; id++) {

	id = driver->id_table;

	if (!id)

		return 0;



	for (; id->match_flags != 0; id++) {

		if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) &&

		    id->vendor_id != ud->vendor_id)

			continue;

drivers/ieee1394/raw1394.c

+0 −1
Original line number Diff line number Diff line
@@ -2959,7 +2959,6 @@ MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 


static struct hpsb_protocol_driver raw1394_driver = {

	.name = "raw1394",

	.id_table = raw1394_id_table,

};



/******************************************************************************/

drivers/ieee1394/video1394.c

+1 −2
Original line number Diff line number Diff line
@@ -1316,7 +1316,6 @@ MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 


static struct hpsb_protocol_driver video1394_driver = {

	.name = VIDEO1394_DRIVER_NAME,

	.id_table	= video1394_id_table,

};