Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205658
b: refs/heads/master
c: a46f908
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jun 18, 2010
1 parent a1a9778 commit 28efd10
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 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: 0f3ff30b9384ffa1b435f263234531582080b100
refs/heads/master: a46f9087e634224b3d0a6560e223425816846dff
9 changes: 3 additions & 6 deletions trunk/drivers/staging/dt3155/dt3155_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ int dt3155_errno = 0;
/* wait queue for interrupts */
wait_queue_head_t dt3155_read_wait_queue[MAXBOARDS];

#define DT_3155_SUCCESS 0
#define DT_3155_FAILURE -EIO

/* set to dynamicaly allocate, but it is tunable: */
/* insmod DT_3155 dt3155 dt3155_major=XX */
int dt3155_major = 0;
Expand Down Expand Up @@ -942,11 +939,11 @@ static int find_PCI (void)
}
ndevices = pci_index;

return DT_3155_SUCCESS;
return 0;

err:
pci_dev_put(pci_dev);
return DT_3155_FAILURE;
return -EIO;
}

u32 allocatorAddr = 0;
Expand Down Expand Up @@ -1000,7 +997,7 @@ int init_module(void)
/* Now let's find the hardware. find_PCI() will set ndevices to the
* number of cards found in this machine. */
{
if ((rcode = find_PCI()) != DT_3155_SUCCESS)
if ((rcode = find_PCI()) != 0)
{
printk("DT3155 error: find_PCI() failed to find dt3155 board(s)\n");
unregister_chrdev(dt3155_major, "dt3155");
Expand Down

0 comments on commit 28efd10

Please sign in to comment.