Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40443
b: refs/heads/master
c: a230a67
h: refs/heads/master
i:
  40441: 38b449a
  40439: 8f1f2fa
v: v3
  • Loading branch information
Om Narasimhan authored and Dominik Brodowski committed Oct 26, 2006
1 parent 16613d4 commit b622761
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f465ce176fb2f1778a04fc3fcb2b8aa564901419
refs/heads/master: a230a6785dd5af84b8b043a64d8df8adc81f3724
15 changes: 9 additions & 6 deletions trunk/drivers/pcmcia/au1000_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -365,7 +366,7 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops,
* 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;
Expand Down Expand Up @@ -438,17 +439,19 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops,
dev_set_drvdata(dev, sinfo);
return 0;

do {
struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);

out_err:
flush_scheduled_work();
ops->hw_shutdown(skt);
while (i-- > 0) {
skt = PCMCIA_SOCKET(i);

del_timer_sync(&skt->poll_timer);
pcmcia_unregister_socket(&skt->socket);
out_err:
flush_scheduled_work();
ops->hw_shutdown(skt);

i--;
} while (i > 0);
}
kfree(sinfo);
out:
return ret;
Expand Down

0 comments on commit b622761

Please sign in to comment.