Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
7b8f8d96
R
rt-thread
项目概览
BaiXuePrincess
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
7b8f8d96
编写于
1月 28, 2018
作者:
armink_ztl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[DeviceDriver][SFUD] Fix flash device lock not detach when an error occurred. #1167
上级
c63d9a88
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
3 deletion
+10
-3
components/drivers/spi/spi_flash_sfud.c
components/drivers/spi/spi_flash_sfud.c
+10
-3
未找到文件。
components/drivers/spi/spi_flash_sfud.c
浏览文件 @
7b8f8d96
...
@@ -250,8 +250,13 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
...
@@ -250,8 +250,13 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
spi_flash_dev_name_bak
=
(
char
*
)
rt_malloc
(
rt_strlen
(
spi_flash_dev_name
)
+
1
);
spi_flash_dev_name_bak
=
(
char
*
)
rt_malloc
(
rt_strlen
(
spi_flash_dev_name
)
+
1
);
spi_dev_name_bak
=
(
char
*
)
rt_malloc
(
rt_strlen
(
spi_dev_name
)
+
1
);
spi_dev_name_bak
=
(
char
*
)
rt_malloc
(
rt_strlen
(
spi_dev_name
)
+
1
);
if
(
rtt_dev
&&
sfud_dev
&&
spi_flash_dev_name_bak
&&
spi_dev_name_bak
)
{
if
(
rtt_dev
)
{
rt_memset
(
rtt_dev
,
0
,
sizeof
(
struct
spi_flash_device
));
rt_memset
(
rtt_dev
,
0
,
sizeof
(
struct
spi_flash_device
));
/* initialize lock */
rt_mutex_init
(
&
(
rtt_dev
->
lock
),
spi_flash_dev_name
,
RT_IPC_FLAG_FIFO
);
}
if
(
rtt_dev
&&
sfud_dev
&&
spi_flash_dev_name_bak
&&
spi_dev_name_bak
)
{
rt_memset
(
sfud_dev
,
0
,
sizeof
(
sfud_flash
));
rt_memset
(
sfud_dev
,
0
,
sizeof
(
sfud_flash
));
rt_strncpy
(
spi_flash_dev_name_bak
,
spi_flash_dev_name
,
rt_strlen
(
spi_flash_dev_name
));
rt_strncpy
(
spi_flash_dev_name_bak
,
spi_flash_dev_name
,
rt_strlen
(
spi_flash_dev_name
));
rt_strncpy
(
spi_dev_name_bak
,
spi_dev_name
,
rt_strlen
(
spi_dev_name
));
rt_strncpy
(
spi_dev_name_bak
,
spi_dev_name
,
rt_strlen
(
spi_dev_name
));
...
@@ -268,8 +273,6 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
...
@@ -268,8 +273,6 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
}
}
sfud_dev
->
spi
.
name
=
spi_dev_name_bak
;
sfud_dev
->
spi
.
name
=
spi_dev_name_bak
;
rt_spi_configure
(
rtt_dev
->
rt_spi_device
,
&
cfg
);
rt_spi_configure
(
rtt_dev
->
rt_spi_device
,
&
cfg
);
/* initialize lock */
rt_mutex_init
(
&
(
rtt_dev
->
lock
),
spi_flash_dev_name
,
RT_IPC_FLAG_FIFO
);
}
}
/* SFUD flash device initialize */
/* SFUD flash device initialize */
{
{
...
@@ -308,6 +311,10 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
...
@@ -308,6 +311,10 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const
}
}
error:
error:
if
(
rtt_dev
)
{
rt_mutex_detach
(
&
(
rtt_dev
->
lock
));
}
/* may be one of objects memory was malloc success, so need free all */
/* may be one of objects memory was malloc success, so need free all */
rt_free
(
rtt_dev
);
rt_free
(
rtt_dev
);
rt_free
(
sfud_dev
);
rt_free
(
sfud_dev
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录