Skip to content

Commit ab54344

Browse files
authored
Merge pull request torvalds#597 from lrh2000/pci-io-override
lkl: pci: Never override IORESOURCE_IO
2 parents f22c28b + 8aba507 commit ab54344

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/lkl/drivers/pci.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static int lkl_pci_override_resource(struct pci_dev *dev, void *data)
4444
int i;
4545
struct resource *r;
4646
resource_size_t start, size;
47-
void *remapped_start = NULL;
47+
void *remapped_start;
4848

4949
if (dev->devfn != 0)
5050
return 0;
@@ -67,6 +67,8 @@ static int lkl_pci_override_resource(struct pci_dev *dev, void *data)
6767
remapped_start =
6868
lkl_ops->pci_ops->resource_alloc(
6969
dev->sysdata, size, i);
70+
} else {
71+
remapped_start = NULL;
7072
}
7173

7274
if (remapped_start) {

0 commit comments

Comments
 (0)