The patch titled
mca: add integrated device bus matching (update)
has been added to the -mm tree. Its filename is
mca-add-integrated-device-bus-matching-update.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mca: add integrated device bus matching (update)
From: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
The first patch was partial. There's no way to specify attaching *only* to an
integrated function. This update allows this.
Signed-off-by: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mca/mca-bus.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff -puN drivers/mca/mca-bus.c~mca-add-integrated-device-bus-matching-update drivers/mca/mca-bus.c
--- a/drivers/mca/mca-bus.c~mca-add-integrated-device-bus-matching-update
+++ a/drivers/mca/mca-bus.c
@@ -48,15 +48,14 @@ static int mca_bus_match (struct device
struct mca_device *mca_dev = to_mca_device (dev);
struct mca_driver *mca_drv = to_mca_driver (drv);
const unsigned short *mca_ids = mca_drv->id_table;
- int i;
+ int i = 0;
- if (!mca_ids)
- return 0;
-
- for(i = 0; mca_ids[i]; i++) {
- if (mca_ids[i] == mca_dev->pos_id) {
- mca_dev->index = i;
- return 1;
+ if (mca_ids) {
+ for(i = 0; mca_ids[i]; i++) {
+ if (mca_ids[i] == mca_dev->pos_id) {
+ mca_dev->index = i;
+ return 1;
+ }
}
}
/* If the integrated id is present, treat it as though it were an
_
Patches currently in -mm which might be from James.Bottomley@xxxxxxxxxxxx are
origin.patch
mca-fix-bus-matching.patch
mca-add-integrated-device-bus-matching.patch
mca-add-integrated-device-bus-matching-update.patch
fix--confusion-in-fusion-driver.patch
upper-32-bits.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
