Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 376545
b: refs/heads/master
c: b204a4d
h: refs/heads/master
i:
  376543: 2bd19f7
v: v3
  • Loading branch information
Helge Deller committed Jun 1, 2013
1 parent 1156325 commit bea361b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b47d4934e71d918814aee4a1d0211f81329b767e
refs/heads/master: b204a4d2d4f2061659bb5c33f5a4013fb0f6ffbe
8 changes: 4 additions & 4 deletions trunk/drivers/parisc/lba_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ lba_fixup_bus(struct pci_bus *bus)
BUG();
}

if (ldev->hba.elmmio_space.start) {
if (ldev->hba.elmmio_space.flags) {
err = request_resource(&iomem_resource,
&(ldev->hba.elmmio_space));
if (err < 0) {
Expand Down Expand Up @@ -993,15 +993,15 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)

case PAT_LMMIO:
/* used to fix up pre-initialized MEM BARs */
if (!lba_dev->hba.lmmio_space.start) {
if (!lba_dev->hba.lmmio_space.flags) {
sprintf(lba_dev->hba.lmmio_name,
"PCI%02x LMMIO",
(int)lba_dev->hba.bus_num.start);
lba_dev->hba.lmmio_space_offset = p->start -
io->start;
r = &lba_dev->hba.lmmio_space;
r->name = lba_dev->hba.lmmio_name;
} else if (!lba_dev->hba.elmmio_space.start) {
} else if (!lba_dev->hba.elmmio_space.flags) {
sprintf(lba_dev->hba.elmmio_name,
"PCI%02x ELMMIO",
(int)lba_dev->hba.bus_num.start);
Expand Down Expand Up @@ -1495,7 +1495,7 @@ lba_driver_probe(struct parisc_device *dev)

pci_add_resource_offset(&resources, &lba_dev->hba.io_space,
HBA_PORT_BASE(lba_dev->hba.hba_num));
if (lba_dev->hba.elmmio_space.start)
if (lba_dev->hba.elmmio_space.flags)
pci_add_resource_offset(&resources, &lba_dev->hba.elmmio_space,
lba_dev->hba.lmmio_space_offset);
if (lba_dev->hba.lmmio_space.flags)
Expand Down

0 comments on commit bea361b

Please sign in to comment.