The patch titled
fixed PCMCIA au1000_generic.c
has been added to the -mm tree. Its filename is
pcmcia-au1000_generic-fix-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fixed PCMCIA au1000_generic.c
From: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
pcmcia-au1000_generic-fix.patch has a problem. It needs more fix.
ops->shutdown(skt), skt is out of definition scope.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@xxxxxxxxxxxxxx>
Cc: Om Narasimhan <om.turyx@xxxxxxxxx>
Cc: Dominik Brodowski <linux@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/pcmcia/au1000_generic.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/pcmcia/au1000_generic.c~pcmcia-au1000_generic-fix-fix drivers/pcmcia/au1000_generic.c
--- a/drivers/pcmcia/au1000_generic.c~pcmcia-au1000_generic-fix-fix
+++ a/drivers/pcmcia/au1000_generic.c
@@ -351,6 +351,7 @@ struct skt_dev_info {
int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr)
{
struct skt_dev_info *sinfo;
+ struct au1000_pcmcia_socket *skt;
int ret, i;
sinfo = kzalloc(sizeof(struct skt_dev_info), GFP_KERNEL);
@@ -365,7 +366,7 @@ int au1x00_pcmcia_socket_probe(struct de
* Initialise the per-socket structure.
*/
for (i = 0; i < nr; i++) {
- struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
+ skt = PCMCIA_SOCKET(i);
memset(skt, 0, sizeof(*skt));
skt->socket.resource_ops = &pccard_static_ops;
@@ -442,7 +443,7 @@ out_err:
flush_scheduled_work();
ops->hw_shutdown(skt);
while (i-- > 0) {
- struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
+ skt = PCMCIA_SOCKET(i);
del_timer_sync(&skt->poll_timer);
pcmcia_unregister_socket(&skt->socket);
flush_scheduled_work();
_
Patches currently in -mm which might be from yoichi_yuasa@xxxxxxxxxxxxxx are
pcmcia-au1000_generic-fix-fix.patch
generic-ioremap_page_range-mips-conversion.patch
-
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
