diff options
| author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
|---|---|---|
| committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
| commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
| tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xen/drivers/ide/ide-xeno.c | |
| parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
| parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
| download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip | |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xen/drivers/ide/ide-xeno.c')
| -rw-r--r-- | xen/drivers/ide/ide-xeno.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xen/drivers/ide/ide-xeno.c b/xen/drivers/ide/ide-xeno.c index 49ecde74e4..351e2cbcf5 100644 --- a/xen/drivers/ide/ide-xeno.c +++ b/xen/drivers/ide/ide-xeno.c @@ -12,7 +12,7 @@ void ide_probe_devices(xen_disk_info_t* xdi) int loop; unsigned int unit; xen_disk_info_t *xen_xdi = map_domain_mem(virt_to_phys(xdi)); - unsigned long capacity; + unsigned long capacity, device; ide_drive_t *drive; for ( loop = 0; loop < MAX_HWIFS; loop++ ) @@ -25,9 +25,10 @@ void ide_probe_devices(xen_disk_info_t* xdi) drive = &hwif->drives[unit]; if ( !drive->present ) continue; + device = MK_IDE_XENDEV((loop * MAX_DRIVES) + unit); capacity = current_capacity(drive); - xen_xdi->disks[xen_xdi->count].device = - MK_IDE_XENDEV((loop * MAX_DRIVES) + unit); + + xen_xdi->disks[xen_xdi->count].device = device; xen_xdi->disks[xen_xdi->count].capacity = capacity; xen_xdi->count++; |