projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[deliverable/linux.git]
/
drivers
/
parport
/
parport_cs.c
diff --git
a/drivers/parport/parport_cs.c
b/drivers/parport/parport_cs.c
index 316c06f4423c381ba05792840750b683d4ba4add..802a81d4736778192166ff41e7d8635b3cb5a406 100644
(file)
--- a/
drivers/parport/parport_cs.c
+++ b/
drivers/parport/parport_cs.c
@@
-105,9
+105,8
@@
static int parport_probe(struct pcmcia_device *link)
DEBUG(0, "parport_attach()\n");
/* Create new parport device */
DEBUG(0, "parport_attach()\n");
/* Create new parport device */
- info = k
m
alloc(sizeof(*info), GFP_KERNEL);
+ info = k
z
alloc(sizeof(*info), GFP_KERNEL);
if (!info) return -ENOMEM;
if (!info) return -ENOMEM;
- memset(info, 0, sizeof(*info));
link->priv = info;
info->p_dev = link;
link->priv = info;
info->p_dev = link;
@@
-201,7
+200,7
@@
static int parport_config(struct pcmcia_device *link)
p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,
link->irq.AssignedIRQ, PARPORT_DMA_NONE,
p = parport_pc_probe_port(link->io.BasePort1, link->io.BasePort2,
link->irq.AssignedIRQ, PARPORT_DMA_NONE,
-
NULL
);
+
&link->dev
);
if (p == NULL) {
printk(KERN_NOTICE "parport_cs: parport_pc_probe_port() at "
"0x%3x, irq %u failed\n", link->io.BasePort1,
if (p == NULL) {
printk(KERN_NOTICE "parport_cs: parport_pc_probe_port() at "
"0x%3x, irq %u failed\n", link->io.BasePort1,
This page took
0.048264 seconds
and
5
git commands to generate.