Skip to content

Commit

Permalink
ide-cs: fix releasing I/O resources
Browse files Browse the repository at this point in the history
hwif content is already freed after ide_release() call so cache
hwif->io_ports.{data,ctl}_addr in local variables in ide_detach().

This fixes post-2.6.25 regression.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jun 15, 2008
1 parent 792a1a9 commit fbc69fd
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/ide/legacy/ide-cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,17 @@ static void ide_detach(struct pcmcia_device *link)
{
ide_info_t *info = link->priv;
ide_hwif_t *hwif = info->hwif;
unsigned long data_addr, ctl_addr;

DEBUG(0, "ide_detach(0x%p)\n", link);

data_addr = hwif->io_ports.data_addr;
ctl_addr = hwif->io_ports.ctl_addr;

ide_release(link);

release_region(hwif->io_ports.ctl_addr, 1);
release_region(hwif->io_ports.data_addr, 8);
release_region(ctl_addr, 1);
release_region(data_addr, 8);

kfree(info);
} /* ide_detach */
Expand Down

0 comments on commit fbc69fd

Please sign in to comment.