diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /drivers/ata/sata_svw.c | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ata/sata_svw.c')
| -rw-r--r-- | drivers/ata/sata_svw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c index 2a7e3495cf16..d6d6658d8328 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c | |||
| @@ -268,7 +268,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start, | |||
| 268 | /* Match it to a port node */ | 268 | /* Match it to a port node */ |
| 269 | index = (ap == ap->host->ports[0]) ? 0 : 1; | 269 | index = (ap == ap->host->ports[0]) ? 0 : 1; |
| 270 | for (np = np->child; np != NULL; np = np->sibling) { | 270 | for (np = np->child; np != NULL; np = np->sibling) { |
| 271 | u32 *reg = (u32 *)get_property(np, "reg", NULL); | 271 | const u32 *reg = get_property(np, "reg", NULL); |
| 272 | if (!reg) | 272 | if (!reg) |
| 273 | continue; | 273 | continue; |
| 274 | if (index == *reg) | 274 | if (index == *reg) |