diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-20 20:46:21 -0400 |
commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /drivers/mtd/maps/pcmciamtd.c | |
parent | d59bf96cdde5b874a57bfd1425faa45da915d0b7 (diff) | |
parent | 077e98945db7e54a9865b5f29a1f02f531eca414 (diff) |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'drivers/mtd/maps/pcmciamtd.c')
-rw-r--r-- | drivers/mtd/maps/pcmciamtd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index d27f4129afd3..c861134cbc48 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -713,6 +713,7 @@ static void pcmciamtd_detach(struct pcmcia_device *link) | |||
713 | 713 | ||
714 | if(dev->mtd_info) { | 714 | if(dev->mtd_info) { |
715 | del_mtd_device(dev->mtd_info); | 715 | del_mtd_device(dev->mtd_info); |
716 | map_destroy(dev->mtd_info); | ||
716 | info("mtd%d: Removed", dev->mtd_info->index); | 717 | info("mtd%d: Removed", dev->mtd_info->index); |
717 | } | 718 | } |
718 | 719 | ||