From 0a0291ce757c6bcb81193dc4a4ee651761e3f254 Mon Sep 17 00:00:00 2001 From: Daniel Ritz Date: Fri, 10 Aug 2007 13:00:58 -0700 Subject: [PATCH] --- yaml --- r: 63854 b: refs/heads/master c: 925796e0ed6fe529770ba71454c58c8d4d8a5ac4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/pcmcia/cm4000_cs.c | 5 ++--- trunk/drivers/char/pcmcia/cm4040_cs.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cff34e59012b..5f711057882e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5a69adff920ddf138c3ea9886574b195d9e3d52 +refs/heads/master: 925796e0ed6fe529770ba71454c58c8d4d8a5ac4 diff --git a/trunk/drivers/char/pcmcia/cm4000_cs.c b/trunk/drivers/char/pcmcia/cm4000_cs.c index fee58e03dbe2..4177f6db83e9 100644 --- a/trunk/drivers/char/pcmcia/cm4000_cs.c +++ b/trunk/drivers/char/pcmcia/cm4000_cs.c @@ -1629,7 +1629,7 @@ static int cmm_open(struct inode *inode, struct file *filp) { 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, struct file *filp) 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_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); } diff --git a/trunk/drivers/char/pcmcia/cm4040_cs.c b/trunk/drivers/char/pcmcia/cm4040_cs.c index af88181a17f4..b24a3e7bbb9f 100644 --- a/trunk/drivers/char/pcmcia/cm4040_cs.c +++ b/trunk/drivers/char/pcmcia/cm4040_cs.c @@ -599,7 +599,7 @@ static int reader_config(struct pcmcia_device *link, int devno) static void reader_release(struct pcmcia_device *link) { - cm4040_reader_release(link->priv); + cm4040_reader_release(link); pcmcia_disable_device(link); }