devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

mutex_lock/unlock must be moved up a level to make the verify code in sd-as3525.c safe

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27180 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tobias Diedrich 2010-06-29 19:12:57 +00:00
parent cdf27ae121
commit 23cf76c2af
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/target/arm/as3525/sd-as3525.c
View file

@ -689,7 +689,6 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
unsigned long response; unsigned long response;
bool aligned = !((uintptr_t)buf & (CACHEALIGN_SIZE - 1)); bool aligned = !((uintptr_t)buf & (CACHEALIGN_SIZE - 1));
mutex_lock(&sd_mtx);
sd_enable(true); sd_enable(true);
led(true); led(true);
@ -870,14 +869,19 @@ sd_transfer_error_nodma:
if (ret) /* error */ if (ret) /* error */
card_info[drive].initialized = 0; card_info[drive].initialized = 0;
mutex_unlock(&sd_mtx);
return ret; return ret;
} }
int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count, int sd_read_sectors(IF_MD2(int drive,) unsigned long start, int count,
void* buf) void* buf)
{ {
return sd_transfer_sectors(IF_MD2(drive,) start, count, buf, false); int ret;
mutex_lock(&sd_mtx);
ret = sd_transfer_sectors(IF_MD2(drive,) start, count, buf, false);
mutex_unlock(&sd_mtx);
return ret;
} }
int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count, int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
@ -890,11 +894,13 @@ int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
#endif #endif
int ret; int ret;
mutex_lock(&sd_mtx);
ret = sd_transfer_sectors(IF_MD2(drive,) start, count, (void*)buf, true); ret = sd_transfer_sectors(IF_MD2(drive,) start, count, (void*)buf, true);
#ifdef VERIFY_WRITE #ifdef VERIFY_WRITE
if (ret) /* write failed, no point in verifying */ if (ret) /* write failed, no point in verifying */
return ret; goto write_error;
count = saved_count; count = saved_count;
buf = saved_buf; buf = saved_buf;
@ -916,6 +922,10 @@ int sd_write_sectors(IF_MD2(int drive,) unsigned long start, int count,
start += transfer; start += transfer;
} }
#endif #endif
write_error:
mutex_unlock(&sd_mtx);
return ret; return ret;
} }