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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
media
/
video
/
hexium_gemini.c
diff --git
a/drivers/media/video/hexium_gemini.c
b/drivers/media/video/hexium_gemini.c
index
e620a3a
..
ad2c232
100644
(file)
--- a/
drivers/media/video/hexium_gemini.c
+++ b/
drivers/media/video/hexium_gemini.c
@@
-356,9
+356,6
@@
static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
DEB_EE((".\n"));
- ret = saa7146_vv_devinit(dev);
- if (ret)
- return ret;
hexium = kzalloc(sizeof(struct hexium), GFP_KERNEL);
if (NULL == hexium) {
printk("hexium_gemini: not enough kernel memory in hexium_attach().\n");