diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2008-03-12 10:03:52 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2008-03-12 10:03:52 +0000 |
| commit | 06a5299aff38ba25c7742ae6293c588e38445f8b (patch) | |
| tree | 5f8c3121882ba9c8d6317d1ce7fb5a07d3a99f5c /firmware/common | |
| parent | 2f5a37de5c45333453169ffe0b90e0f380d1cd50 (diff) | |
Do some crackdown on kernel object reinitialization after they could be in use and use before initialization. For c200/e200: Be sure fat cache and ata locks are acquired in the proper order during hot swapping. Delay hotswap monitoring until after initial file mounting (address 2nd kobj concern + possible call of fat driver before init).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16636 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/common')
| -rw-r--r-- | firmware/common/disk.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/common/disk.c b/firmware/common/disk.c index 3d4dd3dc1d..c6200ba286 100644 --- a/firmware/common/disk.c +++ b/firmware/common/disk.c @@ -104,7 +104,7 @@ int disk_mount_all(void) int mounted; int i; -#ifdef HAVE_MMC +#if defined(HAVE_MMC) || defined(HAVE_HOTSWAP) card_enable_monitoring(false); #endif @@ -118,10 +118,9 @@ int disk_mount_all(void) { mounted += disk_mount(1); /* try 2nd "drive", too */ } -#ifdef HAVE_MMC + card_enable_monitoring(true); #endif -#endif return mounted; } |