[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20061004224406.46a9d05c.yoichi_yuasa@tripeaks.co.jp>
Date: Wed, 4 Oct 2006 22:44:06 +0900
From: Yoichi Yuasa <yoichi_yuasa@...peaks.co.jp>
To: Andrew Morton <akpm@...l.org>
Cc: yoichi_yuasa@...peaks.co.jp, linux-kernel@...r.kernel.org
Subject: [-mm PATCH] fixed PCMCIA au1000_generic.c
Hi,
pcmcia-au1000_generic-fix.patch has a problem.
It needs more fix.
ops->shutdown(skt), skt is out of definition scope.
Yoichi
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@...peaks.co.jp>
diff -pruN -X linux-2.6.18-mm3/Documentation/dontdiff linux-2.6.18-mm3-orig/drivers/pcmcia/au1000_generic.c linux-2.6.18-mm3/drivers/pcmcia/au1000_generic.c
--- linux-2.6.18-mm3-orig/drivers/pcmcia/au1000_generic.c 2006-10-04 11:24:33.017136250 +0900
+++ linux-2.6.18-mm3/drivers/pcmcia/au1000_generic.c 2006-10-04 22:32:21.806060500 +0900
@@ -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();
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists