[DM/FIXUP] Fixup block value init

GuEe-GUI · Rbb666 · commit 1c54ff4de60b · 2024-12-13T10:39:20.000+08:00
Signed-off-by: GuEe-GUI &lt;2991707448@qq.com&gt;
diff --git a/components/drivers/block/blk.c b/components/drivers/block/blk.c
@@ -195,6 +195,10 @@ static rt_err_t blk_control(rt_device_t dev, int cmd, void *args)
         {
             err = disk->ops->control(disk, RT_NULL, cmd, args);
         }
+        else
+        {
+            err = -RT_ENOSYS;
+        }
         break;
     }
 
@@ -344,7 +348,7 @@ rt_err_t rt_hw_blk_disk_unregister(struct rt_blk_disk *disk)
 
     spin_lock(&disk->lock);
 
-    if (disk->parent.ref_count != 1)
+    if (disk->parent.ref_count > 0)
     {
         err = -RT_EBUSY;
         goto _unlock;
@@ -470,7 +474,7 @@ INIT_ENV_EXPORT(blk_dfs_mnt_table);
 const char *convert_size(struct rt_device_blk_geometry *geome,
         rt_size_t sector_count, rt_size_t *out_cap, rt_size_t *out_minor)
 {
-    rt_size_t cap, minor;
+    rt_size_t cap, minor = 0;
     int size_index = 0;
     const char *size_name[] = { "B", "K", "M", "G", "T", "P", "E" };
 

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,10 @@ static rt_err_t blk_control(rt_device_t dev, int cmd, void *args)`
`195`	`195`	`{`
`196`	`196`	`err = disk->ops->control(disk, RT_NULL, cmd, args);`
`197`	`197`	`}`
	`198`	`+ else`
	`199`	`+ {`
	`200`	`+ err = -RT_ENOSYS;`
	`201`	`+ }`
`198`	`202`	`break;`
`199`	`203`	`}`
`200`	`204`
`@@ -344,7 +348,7 @@ rt_err_t rt_hw_blk_disk_unregister(struct rt_blk_disk *disk)`
`344`	`348`
`345`	`349`	`spin_lock(&disk->lock);`
`346`	`350`
`347`		`- if (disk->parent.ref_count != 1)`
	`351`	`+ if (disk->parent.ref_count > 0)`
`348`	`352`	`{`
`349`	`353`	`err = -RT_EBUSY;`
`350`	`354`	`goto _unlock;`
`@@ -470,7 +474,7 @@ INIT_ENV_EXPORT(blk_dfs_mnt_table);`
`470`	`474`	`const char convert_size(struct rt_device_blk_geometry geome,`
`471`	`475`	`rt_size_t sector_count, rt_size_t out_cap, rt_size_t out_minor)`
`472`	`476`	`{`
`473`		`- rt_size_t cap, minor;`
	`477`	`+ rt_size_t cap, minor = 0;`
`474`	`478`	`int size_index = 0;`
`475`	`479`	`const char *size_name[] = { "B", "K", "M", "G", "T", "P", "E" };`
`476`	`480`