diff options
author | Tejun Heo <htejun@gmail.com> | 2007-02-27 08:33:21 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-03-01 20:16:28 -0500 |
commit | 1aa56cca5bfa396c791e93b38e4776ef39b590a7 (patch) | |
tree | c4e88e2195dfc1db88c932e5c2b9adb151bb9d65 /drivers/ata/libata-core.c | |
parent | 7b965e0884cee430ffe5dc81cdb117b9316b0549 (diff) |
libata: clear drvdata in ata_host_release(), take#2
Clearing drvdata in ->remove_one causes NULL pointer deference. Clear
drvdata only in ata_host_release() after all resources are freed.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c8d44a7c403f..17ad152714e6 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -5680,6 +5680,8 @@ static void ata_host_release(struct device *gendev, void *res) | |||
5680 | 5680 | ||
5681 | if (host->ops->host_stop) | 5681 | if (host->ops->host_stop) |
5682 | host->ops->host_stop(host); | 5682 | host->ops->host_stop(host); |
5683 | |||
5684 | dev_set_drvdata(gendev, NULL); | ||
5683 | } | 5685 | } |
5684 | 5686 | ||
5685 | /** | 5687 | /** |
@@ -5902,7 +5904,6 @@ int ata_device_add(const struct ata_probe_ent *ent) | |||
5902 | 5904 | ||
5903 | err_out: | 5905 | err_out: |
5904 | devres_release_group(dev, ata_device_add); | 5906 | devres_release_group(dev, ata_device_add); |
5905 | dev_set_drvdata(dev, NULL); | ||
5906 | VPRINTK("EXIT, returning %d\n", rc); | 5907 | VPRINTK("EXIT, returning %d\n", rc); |
5907 | return 0; | 5908 | return 0; |
5908 | } | 5909 | } |