lkml.org 
[lkml]   [2006]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [-mm PATCH] fixed PCMCIA au1000_generic.c
On 10/4/06, Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> wrote:
> Hi,
>
Sorry for the late reply.
> pcmcia-au1000_generic-fix.patch has a problem.
> It needs more fix.
> ops->shutdown(skt), skt is out of definition scope.

Is it so?
After applying the patch, the code would look like,
-----

skt->status = au1x00_pcmcia_skt_state(skt);

ret = pcmcia_register_socket(&skt->socket);
if (ret)
goto out_err;
<snip>

out_err:
flush_scheduled_work();
ops->hw_shutdown(skt);
while (i-- > 0) {
struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
del_timer_sync(&skt->poll_timer);
pcmcia_unregister_socket(&skt->socket);
flush_scheduled_work();
ops->hw_shutdown(skt);
i--;
}
kfree(sinfo);
-----
The first call to ops->shutdown(skt) would free the skt (of the
function scope). The internal skt to the loop is a placeholder to call
shutdown().
Or did I miss any point?

Regards,
Om.
>
> Yoichi
>
> Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.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@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-10-06 08:21    [W:0.204 / U:0.356 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site