oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc:Fixes for coverity.

Browse Source 
Change-Id: I25e406126deb9172276844e1bb756e22e1f449f8
This commit is contained in:
Kees Jongenburger 2012-10-22 13:34:40 +02:00
parent 23a61ee0eb
commit 9a5aca794e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mmc/mmcblk.c
View File

@ -100,8 +100,8 @@ apply_env()
* log_level=[0-4] (NONE,WARNING,INFO,DEBUG,TRACE) instance=[0-3] * log_level=[0-4] (NONE,WARNING,INFO,DEBUG,TRACE) instance=[0-3]
* instance/bus number to use for this driver Passing these arguments * instance/bus number to use for this driver Passing these arguments
* is done when starting the driver using the service command in the * is done when starting the driver using the service command in the
* following way service up /sbin/mmc -args "log_level=2 instance=1" * following way service up /sbin/mmc -args "log_level=2 instance=1
* -dev /dev/c1d0 */ * driver=dummy" -dev /dev/c2d0 */
char driver[16]; char driver[16];
memset(driver, '\0', 16); memset(driver, '\0', 16);
(void) env_get_param("driver", driver, 16); (void) env_get_param("driver", driver, 16);
@ -196,13 +196,13 @@ block_open(dev_t minor, int access)
mmc_log_debug(&log, "part %d\t0x%016llx 0x%016llx\n", i, mmc_log_debug(&log, "part %d\t0x%016llx 0x%016llx\n", i,
slot->card.part[i].dv_base, slot->card.part[i].dv_size); slot->card.part[i].dv_base, slot->card.part[i].dv_size);
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
if (slot->card.part[i * 4 + j].dv_size == 0) if (slot->card.subpart[(i - 1) * 4 + j].dv_size == 0)
continue; continue;
sub_part_count++; sub_part_count++;
mmc_log_debug(&log, mmc_log_debug(&log,
" sub %d/%d\t0x%016llx 0x%016llx\n", i, j, " sub %d/%d\t0x%016llx 0x%016llx\n", i, j,
slot->card.part[i * 4 + j].dv_base, slot->card.subpart[(i - 1) * 4 + j].dv_base,
slot->card.part[i * 4 + j].dv_size); slot->card.subpart[(i - 1) * 4 + j].dv_size);
} }
} }
mmc_log_info(&log, "Found %d partitions and %d sub partitions\n", mmc_log_info(&log, "Found %d partitions and %d sub partitions\n",
@ -515,7 +515,7 @@ block_part(dev_t minor)
mmc_log_trace(&log, mmc_log_trace(&log,
"returning partition(%d) (base,size)=(0x%016llx,0x%016llx)\n", "returning partition(%d) (base,size)=(0x%016llx,0x%016llx)\n",
minor, dev->dv_base, dev->dv_size); minor, dev->dv_base, dev->dv_size);
} else if (minor >= 128 && minor <= 128 + 16) { } else if (minor >= 128 && minor < 128 + 16) {
/* sub partitions of the first disk we don't care about the /* sub partitions of the first disk we don't care about the
* rest */ * rest */
dev = &slot->card.subpart[minor - 128]; dev = &slot->card.subpart[minor - 128];