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 git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
[pandora-kernel.git]
/
drivers
/
staging
/
comedi
/
drivers
/
unioxx5.c
diff --git
a/drivers/staging/comedi/drivers/unioxx5.c
b/drivers/staging/comedi/drivers/unioxx5.c
index
be1d83d
..
16d4c9f
100644
(file)
--- a/
drivers/staging/comedi/drivers/unioxx5.c
+++ b/
drivers/staging/comedi/drivers/unioxx5.c
@@
-285,7
+285,7
@@
static int __unioxx5_subdev_init(struct comedi_subdevice *subdev,
return -EIO;
}
- usp =
(struct unioxx5_subd_priv *)
kzalloc(sizeof(*usp), GFP_KERNEL);
+ usp = kzalloc(sizeof(*usp), GFP_KERNEL);
if (usp == NULL) {
printk(KERN_ERR "comedi%d: erorr! --> out of memory!\n", minor);