diff --git a/[refs] b/[refs] index 22825c6f7258..e054489d0b77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f367993988720c86e863bb64db8a62a002d6d9d +refs/heads/master: 0458294751f8f9a883d518e55a13ea002df1d829 diff --git a/trunk/drivers/media/video/smiapp/smiapp-core.c b/trunk/drivers/media/video/smiapp/smiapp-core.c index 3bf086f836fb..6524091a9a4c 100644 --- a/trunk/drivers/media/video/smiapp/smiapp-core.c +++ b/trunk/drivers/media/video/smiapp/smiapp-core.c @@ -873,7 +873,7 @@ static int smiapp_read_nvm(struct smiapp_sensor *sensor, unsigned char *nvm) { u32 i, s, p, np, v; - int rval, rval2; + int rval = 0, rval2; np = sensor->nvm_size / SMIAPP_NVM_PAGE_SIZE; for (p = 0; p < np; p++) {