git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
drivers
/
staging
/
comedi
/
drivers
/
amplc_pc236.c
diff --git
a/drivers/staging/comedi/drivers/amplc_pc236.c
b/drivers/staging/comedi/drivers/amplc_pc236.c
index
48246cd
..
b4311bf
100644
(file)
--- a/
drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/
drivers/staging/comedi/drivers/amplc_pc236.c
@@
-470,7
+470,7
@@
static int pc236_detach(struct comedi_device *dev)
{
printk(KERN_DEBUG "comedi%d: %s: detach\n", dev->minor,
PC236_DRIVER_NAME);
- if (dev
priv
)
+ if (dev
->iobase
)
pc236_intr_disable(dev);
if (dev->irq)