Commit 3788632d authored by Russell King's avatar Russell King

[PCMCIA] Fix case of two "skt" variables.

We want the value preserved across both sections of code such that
the cleanup works as expected.
parent 4d802161
...@@ -662,6 +662,7 @@ static void soc_pcmcia_cpufreq_unregister(void) ...@@ -662,6 +662,7 @@ static void soc_pcmcia_cpufreq_unregister(void)
int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr) int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr)
{ {
struct skt_dev_info *sinfo; struct skt_dev_info *sinfo;
struct soc_pcmcia_socket *skt;
int ret, i; int ret, i;
down(&soc_pcmcia_sockets_lock); down(&soc_pcmcia_sockets_lock);
...@@ -679,7 +680,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops ...@@ -679,7 +680,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
* Initialise the per-socket structure. * Initialise the per-socket structure.
*/ */
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
struct soc_pcmcia_socket *skt = &sinfo->skt[i]; skt = &sinfo->skt[i];
skt->socket.ops = &soc_common_pcmcia_operations; skt->socket.ops = &soc_common_pcmcia_operations;
skt->socket.owner = ops->owner; skt->socket.owner = ops->owner;
...@@ -777,7 +778,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops ...@@ -777,7 +778,7 @@ int soc_common_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops
goto out; goto out;
do { do {
struct soc_pcmcia_socket *skt = &sinfo->skt[i]; skt = &sinfo->skt[i];
del_timer_sync(&skt->poll_timer); del_timer_sync(&skt->poll_timer);
pcmcia_unregister_socket(&skt->socket); pcmcia_unregister_socket(&skt->socket);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment