The patch titled
drivers/char/pcmcia/cm40x0_cs.c: fix release function call
has been removed from the -mm tree. Its filename was
drivers-char-pcmcia-cm40x0_csc-fix-release-function-call.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: drivers/char/pcmcia/cm40x0_cs.c: fix release function call
From: Daniel Ritz <daniel.ritz-ml@xxxxxxxxxxxxxx>
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@xxxxxx>
Cc: Bill McConnaughey <mcconnau@xxxxxxxxxxxxxxxxx>
Cc: Natalie Protasevich <protasnb@xxxxxxxxx>
Cc: Harald Welte <laforge@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/pcmcia/cm4000_cs.c | 5 ++---
drivers/char/pcmcia/cm4040_cs.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff -puN drivers/char/pcmcia/cm4000_cs.c~drivers-char-pcmcia-cm40x0_csc-fix-release-function-call drivers/char/pcmcia/cm4000_cs.c
--- a/drivers/char/pcmcia/cm4000_cs.c~drivers-char-pcmcia-cm40x0_csc-fix-release-function-call
+++ a/drivers/char/pcmcia/cm4000_cs.c
@@ -1629,7 +1629,7 @@ static int cmm_open(struct inode *inode,
{
struct cm4000_dev *dev;
struct pcmcia_device *link;
- int rc, minor = iminor(inode);
+ int minor = iminor(inode);
if (minor >= CM4000_MAX_DEV)
return -ENODEV;
@@ -1668,7 +1668,6 @@ static int cmm_open(struct inode *inode,
start_monitor(dev);
link->open = 1; /* only one open per device */
- rc = 0;
DEBUGP(2, dev, "<- cmm_open\n");
return nonseekable_open(inode, filp);
@@ -1824,7 +1823,7 @@ static int cm4000_resume(struct pcmcia_d
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);
}
diff -puN drivers/char/pcmcia/cm4040_cs.c~drivers-char-pcmcia-cm40x0_csc-fix-release-function-call drivers/char/pcmcia/cm4040_cs.c
--- a/drivers/char/pcmcia/cm4040_cs.c~drivers-char-pcmcia-cm40x0_csc-fix-release-function-call
+++ a/drivers/char/pcmcia/cm4040_cs.c
@@ -599,7 +599,7 @@ cs_release:
static void reader_release(struct pcmcia_device *link)
{
- cm4040_reader_release(link->priv);
+ cm4040_reader_release(link);
pcmcia_disable_device(link);
}
_
Patches currently in -mm which might be from daniel.ritz-ml@xxxxxxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
