Merge branch 'release-1.0' into develop

Conflicts:
	drivers/maru/maru_codec.c

diff --cc drivers/maru/maru_codec.c
index 76d39b57311aa8a9386786f6b170d3e76b3c3c4c,084568c196f2037f28c11778351c47afd4161474..76afc80aef3afd2f1cee612ed30156e747aa5b80
--- 1/drivers/maru/maru_codec.c
--- 2/drivers/maru/maru_codec.c
+++ b/drivers/maru/maru_codec.c
@@@ -352,29 -351,29 +352,28 @@@ static ssize_t svcodec_write (struct fi
                  printk(KERN_DEBUG "Reset useMmap[%d]=%d\n", i, svcodec->useMmap[i]);
              }
          }
 -              return 0;
 +        return 0;
      }
  #endif
 -      if (paramInfo.apiIndex == EMUL_GET_MMAP_INDEX) {
+ 
 +    if (paramInfo.apiIndex == EMUL_GET_MMAP_INDEX) {
          int i;
          int *mmapIndex;
  
          mmapIndex = (int*)paramInfo.ret;
  
 -              printk(KERN_DEBUG "[%s] before available useMmap count:%d\n",
 -                              __func__, (USABLE_MMAP_MAX_SIZE - svcodec->useMmap[USABLE_MMAP_MAX_SIZE]));
 +        printk(KERN_DEBUG "[%s] before available useMmap count:%d\n",
 +                __func__, (USABLE_MMAP_MAX_SIZE - svcodec->useMmap[USABLE_MMAP_MAX_SIZE]));
- 
          for (i = 0; i < USABLE_MMAP_MAX_SIZE; i++) {
              printk(KERN_DEBUG "useMmap[%d]=%d\n", i, svcodec->useMmap[i]);
              if (svcodec->useMmap[i] == 1) {
 -                  svcodec->useMmap[i] = 0;
 -                  printk(KERN_DEBUG "useMmap[%d]=%d\n", i, svcodec->useMmap[i]);
 -                          (svcodec->useMmap[USABLE_MMAP_MAX_SIZE])++;
 -                              file->private_data = &svcodec->useMmap[i];
 -                              printk(KERN_DEBUG "[%s] after available useMmap count:%d\n",
 -                                              __func__, (USABLE_MMAP_MAX_SIZE - svcodec->useMmap[USABLE_MMAP_MAX_SIZE]));
 -                              printk(KERN_DEBUG "[%s] return %d as the index of mmap\n", __func__, i);
 -
 +                svcodec->useMmap[i] = 0;
 +                printk(KERN_DEBUG "useMmap[%d]=%d\n", i, svcodec->useMmap[i]);
 +                (svcodec->useMmap[USABLE_MMAP_MAX_SIZE])++;
 +                file->private_data = &svcodec->useMmap[i];
 +                printk(KERN_DEBUG "[%s] after available useMmap count:%d\n",
 +                        __func__, (USABLE_MMAP_MAX_SIZE - svcodec->useMmap[USABLE_MMAP_MAX_SIZE]));
 +                printk(KERN_DEBUG "[%s] return %d as the index of mmap\n", __func__, i);
- 
                  break;
              }
          }
@@@ -413,14 -412,14 +412,11 @@@
      }
  #endif
  
 -      if (paramInfo.apiIndex == EMUL_AVCODEC_ALLOC_CONTEXT) {
 -              writel((uint32_t)file, svcodec->ioaddr + CODEC_FILE_INDEX);
 -      }
 -
 +    if (paramInfo.apiIndex == EMUL_AVCODEC_ALLOC_CONTEXT) {
 +        writel((uint32_t)file, svcodec->ioaddr + CODEC_FILE_INDEX);
 +    }
- 
      writel((uint32_t)paramInfo.ctxIndex, svcodec->ioaddr + CODEC_CONTEXT_INDEX);
--
      writel((uint32_t)paramInfo.mmapOffset, svcodec->ioaddr + CODEC_MMAP_OFFSET);
--
      writel((uint32_t)paramInfo.apiIndex, svcodec->ioaddr + CODEC_API_INDEX);
  
      mutex_unlock(&codec_mutex);
@@@ -520,8 -519,8 +516,7 @@@ static int svcodec_release (struct inod
          }
  #endif
      module_put(THIS_MODULE);
--
 -      mutex_unlock(&codec_mutex);
 +    mutex_unlock(&codec_mutex);
  
      return 0;
  }