Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186600
b: refs/heads/master
c: 6910dad
h: refs/heads/master
v: v3
  • Loading branch information
Simon Horman authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent c253514 commit 5c32d79
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 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: c22090facd354749cfe99a46e903449c7ac07788
refs/heads/master: 6910dadf3f11254bc0af79f578c7228b4e1334ac
14 changes: 9 additions & 5 deletions trunk/drivers/staging/dt3155/dt3155_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ static int find_PCI (void)
unsigned long base;
unsigned char irq;

while ((pci_dev = pci_find_device
while ((pci_dev = pci_get_device
(DT3155_VENDORID, DT3155_DEVICEID, pci_dev)) != NULL)
{
pci_index ++;
Expand All @@ -983,7 +983,7 @@ static int find_PCI (void)
"for %d devices\n"
"DT3155: Please change MAXBOARDS in dt3155.h\n",
pci_index, MAXBOARDS);
return DT_3155_FAILURE;
goto err;
}

/* Now, just go out and make sure that this/these device(s) is/are
Expand All @@ -992,7 +992,7 @@ static int find_PCI (void)
(u_int *) &base)))
{
printk("DT3155: Was not able to find device \n");
return DT_3155_FAILURE;
goto err;
}

DT_3155_DEBUG_MSG("DT3155: Base address 0 for device is %lx \n", base);
Expand All @@ -1007,13 +1007,13 @@ static int find_PCI (void)
if ( !dt3155_lbase[pci_index-1] )
{
printk("DT3155: Unable to remap control registers\n");
return DT_3155_FAILURE;
goto err;
}

if ( (error = pci_read_config_byte( pci_dev, PCI_INTERRUPT_LINE, &irq)) )
{
printk("DT3155: Was not able to find device \n");
return DT_3155_FAILURE;
goto err;
}

DT_3155_DEBUG_MSG("DT3155: IRQ is %d \n",irq);
Expand All @@ -1029,6 +1029,10 @@ static int find_PCI (void)
ndevices = pci_index;

return DT_3155_SUCCESS;

err:
pci_dev_put(pci_dev);
return DT_3155_FAILURE;
}

u_long allocatorAddr = 0;
Expand Down

0 comments on commit 5c32d79

Please sign in to comment.