leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/char/pcmcia/cm40x0_cs.c: fix release function call

Browse Source 
cm4000_cs.c and cm4040_cs.c call the internal release function with
an argument of wrong type. this fixes bug #8485

Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Cc: Bill McConnaughey <mcconnau@biochem.wustl.edu>
Cc: Natalie Protasevich <protasnb@gmail.com>
Cc: Harald Welte <laforge@gnumonks.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Daniel Ritz 2007-08-10 13:00:58 -07:00 committed by Linus Torvalds
parent c5a69adff9
commit 925796e0ed
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/char/pcmcia/cm4000_cs.c
View File

@ -1629,7 +1629,7 @@ static int cmm_open(struct inode *inode, struct file *filp)
{ {
struct cm4000_dev *dev; struct cm4000_dev *dev;
struct pcmcia_device *link; struct pcmcia_device *link;
int rc, minor = iminor(inode); int minor = iminor(inode);
if (minor >= CM4000_MAX_DEV) if (minor >= CM4000_MAX_DEV)
return -ENODEV; return -ENODEV;
@ -1668,7 +1668,6 @@ static int cmm_open(struct inode *inode, struct file *filp)
start_monitor(dev); start_monitor(dev);
link->open = 1; /* only one open per device */ link->open = 1; /* only one open per device */
rc = 0;
DEBUGP(2, dev, "<- cmm_open\n"); DEBUGP(2, dev, "<- cmm_open\n");
return nonseekable_open(inode, filp); return nonseekable_open(inode, filp);
@ -1824,7 +1823,7 @@ static int cm4000_resume(struct pcmcia_device *link)
static void cm4000_release(struct pcmcia_device *link) static void cm4000_release(struct pcmcia_device *link)
{ {
cmm_cm4000_release(link->priv); /* delay release until device closed */ cmm_cm4000_release(link); /* delay release until device closed */
pcmcia_disable_device(link); pcmcia_disable_device(link);
} }

2
drivers/char/pcmcia/cm4040_cs.c
View File

@ -599,7 +599,7 @@ cs_release:
static void reader_release(struct pcmcia_device *link) static void reader_release(struct pcmcia_device *link)
{ {
cm4040_reader_release(link->priv); cm4040_reader_release(link);
pcmcia_disable_device(link); pcmcia_disable_device(link);
} }