diff options
author | Alan <alan@lxorguk.ukuu.org.uk> | 2007-02-21 11:41:23 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-25 15:41:40 -0500 |
commit | cc70991d64e767729c37278cd4f80f709556079a (patch) | |
tree | ce4afa107f4fedcab3258839d93c28d9b7bcc213 /drivers/ata | |
parent | 10305f0f8e642590c69674d08bd22accef610aed (diff) |
pata_pcmcia: Fix oops in 2.6.21-rc1
Manuel Lass reports:
> This bug is also present in 2.6.21-rc1, and this patch
> indeed fixes it.
The change to the devres layer re-orders the execution of cleanup
functions and in turn causes the pcmcia layer to oops as it zaps a
pointer now needed later on. We simply leave the pointer alone.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/pata_pcmcia.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index d10ae3e72245..4ef477c12036 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
@@ -308,7 +308,6 @@ static void pcmcia_remove_one(struct pcmcia_device *pdev) | |||
308 | if (info->ndev) { | 308 | if (info->ndev) { |
309 | struct ata_host *host = dev_get_drvdata(dev); | 309 | struct ata_host *host = dev_get_drvdata(dev); |
310 | ata_host_detach(host); | 310 | ata_host_detach(host); |
311 | dev_set_drvdata(dev, NULL); | ||
312 | } | 311 | } |
313 | info->ndev = 0; | 312 | info->ndev = 0; |
314 | pdev->priv = NULL; | 313 | pdev->priv = NULL; |