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 master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
drivers
/
cdrom
/
cm206.c
diff --git
a/drivers/cdrom/cm206.c
b/drivers/cdrom/cm206.c
index
e6d8e9e
..
b6c61bb
100644
(file)
--- a/
drivers/cdrom/cm206.c
+++ b/
drivers/cdrom/cm206.c
@@
-1420,7
+1420,7
@@
int __init cm206_init(void)
return -EIO;
}
printk(" adapter at 0x%x", cm206_base);
- cd =
(struct cm206_struct *)
kmalloc(size, GFP_KERNEL);
+ cd = kmalloc(size, GFP_KERNEL);
if (!cd)
goto out_base;
/* Now we have found the adaptor card, try to reset it. As we have