From 74263ea13b82769747fcd934decfe15971e47b8c Mon Sep 17 00:00:00 2001
From: "Mihail Semenyako (mike.dld)" <mike.dld@gmail.com>
Date: Wed, 10 Aug 2011 19:21:44 +0000
Subject: [PATCH] fs_HdDelete: * correct check for ext2 partition type (never
 reached ext2 implementation)

reserve_cd_channel:
* jump to correct label (wrong channel was being reserved if retry occured)
* re-enable interrupts (were being masked upon proc return)


git-svn-id: svn://kolibrios.org@2044 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/fs/fat32.inc   | 2 +-
 kernel/trunk/fs/iso9660.inc | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/trunk/fs/fat32.inc b/kernel/trunk/fs/fat32.inc
index 67a9b8f34d..b3e49f472d 100644
--- a/kernel/trunk/fs/fat32.inc
+++ b/kernel/trunk/fs/fat32.inc
@@ -2787,7 +2787,7 @@ fs_HdSetFileInfo:
 fs_HdDelete:
         cmp     [fs_type], 1
         jz      ntfs_HdDelete
-        cmp     [fs_type], 1
+        cmp     [fs_type], 2
         jz      ext2_HdDelete
         cmp     [fs_type], 16
         jz      @f
diff --git a/kernel/trunk/fs/iso9660.inc b/kernel/trunk/fs/iso9660.inc
index fac5509b34..e63a3fc650 100644
--- a/kernel/trunk/fs/iso9660.inc
+++ b/kernel/trunk/fs/iso9660.inc
@@ -54,12 +54,14 @@ reserve_cd_channel:
     je	  .reserve_ok_2
     sti
     call  change_task
-    jmp   .IDE_Channel_1
+    jmp   .IDE_Channel_2
 .reserve_ok_1:
     mov [IDE_Channel_1],1
+    sti
     ret
 .reserve_ok_2:
     mov [IDE_Channel_2],1
+    sti
     ret
 
 free_cd_channel: