projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 4.3-rc7 into staging-next
[linux-2.6-block.git]
/
drivers
/
staging
/
comedi
/
drivers
/
daqboard2000.c
diff --git
a/drivers/staging/comedi/drivers/daqboard2000.c
b/drivers/staging/comedi/drivers/daqboard2000.c
index 611b0a3ef5d7587b3962308cf4bbe1af843d9bc5..57ab6680e3aed4c1375820b652ca0938470adcc5 100644
(file)
--- a/
drivers/staging/comedi/drivers/daqboard2000.c
+++ b/
drivers/staging/comedi/drivers/daqboard2000.c
@@
-713,12
+713,8
@@
static int daqboard2000_auto_attach(struct comedi_device *dev,
return result;
s = &dev->subdevices[2];
return result;
s = &dev->subdevices[2];
- result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
- dioP2ExpansionIO8Bit);
- if (result)
- return result;
-
- return 0;
+ return subdev_8255_init(dev, s, daqboard2000_8255_cb,
+ dioP2ExpansionIO8Bit);
}
static void daqboard2000_detach(struct comedi_device *dev)
}
static void daqboard2000_detach(struct comedi_device *dev)