diff options
author | James Bottomley <James.Bottomley@steeleye.com> | 2005-08-15 17:13:19 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-08-28 12:14:06 -0400 |
commit | ebd8bb7647e908e8654e565fa289b0300f9f8fa7 (patch) | |
tree | a2afebb1cdcb6309e2d1bc5e8c39e7895ade9236 /drivers/base | |
parent | 975f24bdc7d3833875309509abbc7da2b2a28234 (diff) |
[SCSI] fix transport class corner case after rework
If your transport class sets the ATTRIBUTE_CONTAINER_NO_CLASSDEVS flag,
then its configure method never gets called. This patch fixes that so
that the configure method is called with a NULL classdev.
Also remove a spurious inverted comma in the transport_class comments.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/base')
-rw-r--r-- | drivers/base/attribute_container.c | 5 | ||||
-rw-r--r-- | drivers/base/transport_class.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c index 62c093db11e6..ebcae5c34133 100644 --- a/drivers/base/attribute_container.c +++ b/drivers/base/attribute_container.c | |||
@@ -237,6 +237,11 @@ attribute_container_device_trigger(struct device *dev, | |||
237 | if (!cont->match(cont, dev)) | 237 | if (!cont->match(cont, dev)) |
238 | continue; | 238 | continue; |
239 | 239 | ||
240 | if (attribute_container_no_classdevs(cont)) { | ||
241 | fn(cont, dev, NULL); | ||
242 | continue; | ||
243 | } | ||
244 | |||
240 | spin_lock(&cont->containers_lock); | 245 | spin_lock(&cont->containers_lock); |
241 | list_for_each_entry_safe(ic, tmp, &cont->containers, node) { | 246 | list_for_each_entry_safe(ic, tmp, &cont->containers, node) { |
242 | if (dev == ic->classdev.dev) | 247 | if (dev == ic->classdev.dev) |
diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c index 4fb4c5de8470..f25e7c6b2d27 100644 --- a/drivers/base/transport_class.c +++ b/drivers/base/transport_class.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * This file is licensed under GPLv2 | 7 | * This file is licensed under GPLv2 |
8 | * | 8 | * |
9 | * The basic idea here is to allow any "device controller" (which | 9 | * The basic idea here is to allow any "device controller" (which |
10 | * would most often be a Host Bus Adapter" to use the services of one | 10 | * would most often be a Host Bus Adapter to use the services of one |
11 | * or more tranport classes for performing transport specific | 11 | * or more tranport classes for performing transport specific |
12 | * services. Transport specific services are things that the generic | 12 | * services. Transport specific services are things that the generic |
13 | * command layer doesn't want to know about (speed settings, line | 13 | * command layer doesn't want to know about (speed settings, line |