diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:41:39 -0500 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/scsi/raid_class.c | |
| parent | c9d557c19f94df42db78d4a5de4d25feee694bad (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/scsi/raid_class.c')
| -rw-r--r-- | drivers/scsi/raid_class.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c index 913a931176ef..8e5c169b03fb 100644 --- a/drivers/scsi/raid_class.c +++ b/drivers/scsi/raid_class.c | |||
| @@ -237,8 +237,7 @@ int raid_component_add(struct raid_template *r,struct device *raid_dev, | |||
| 237 | rc->dev.parent = get_device(component_dev); | 237 | rc->dev.parent = get_device(component_dev); |
| 238 | rc->num = rd->component_count++; | 238 | rc->num = rd->component_count++; |
| 239 | 239 | ||
| 240 | snprintf(rc->dev.bus_id, sizeof(rc->dev.bus_id), | 240 | dev_set_name(&rc->dev, "component-%d", rc->num); |
| 241 | "component-%d", rc->num); | ||
| 242 | list_add_tail(&rc->node, &rd->component_list); | 241 | list_add_tail(&rc->node, &rd->component_list); |
| 243 | rc->dev.class = &raid_class.class; | 242 | rc->dev.class = &raid_class.class; |
| 244 | err = device_add(&rc->dev); | 243 | err = device_add(&rc->dev); |