Merge pull request #2 from Quarx2k/cm-12.1

Cm 12.1
judas77 · Aug 9, 2015 · 30f88d0 · 30f88d0
2 parents 2ba74f9 + 929a261
commit 30f88d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/prebuilt/etc/mixer_paths.xml b/prebuilt/etc/mixer_paths.xml
@@ -728,10 +728,10 @@
         <ctl name="CLASS_H_DSM MUX" value="RX_HPHL" />
         <ctl name="RDAC3 MUX" value="DEM2" />
         <ctl name="HPHL DAC Switch" value="1" />
-        <ctl name="HPHL Volume" value="15" />
-        <ctl name="HPHR Volume" value="15" />
-        <ctl name="RX1 Digital Volume" value="57" />
-        <ctl name="RX2 Digital Volume" value="57" />
+        <ctl name="HPHL Volume" value="20" />
+        <ctl name="HPHR Volume" value="20" />
+        <ctl name="RX1 Digital Volume" value="60" />
+        <ctl name="RX2 Digital Volume" value="60" />
     </path>
 
     <path name="headphones">

diff --git a/rootdir/fstab.w7 b/rootdir/fstab.w7
@@ -9,10 +9,10 @@
 /devices/msm_sdcc.2/mmc_host 				auto		  	vfat	defaults									voldmanaged=sdcard1:auto,noemulatedsd
 /dev/block/platform/msm_sdcc.1/by-name/system   	/system      		ext4    ro,barrier=1                                                                    wait,check
 /dev/block/platform/msm_sdcc.1/by-name/userdata       	/data        		ext4    noatime,nosuid,nodev,barrier=1,noauto_da_alloc,discard,data=ordered,errors=continue     wait,check,encryptable=/dev/block/platform/msm_sdcc.1/by-name/encrypt
-/dev/block/platform/msm_sdcc.1/by-name/userdata         /data        		f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover          wait,nonremovable,encryptable=footer,length=-16384
+/dev/block/platform/msm_sdcc.1/by-name/userdata       	/data        		f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr                         wait,check,encryptable=footer,length=-16384
 /dev/block/platform/msm_sdcc.1/by-name/persist        	/persist     		ext4    nosuid,nodev,barrier=1,data=ordered,nodelalloc                                  wait,check
 /dev/block/platform/msm_sdcc.1/by-name/cache          	/cache       		ext4    noatime,nosuid,nodev,barrier=1,data=ordered                                     wait,check
-/dev/block/platform/msm_sdcc.1/by-name/cache          	/cache       		f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr,errors=recover          wait,nonremovable,length=-16384
+/dev/block/platform/msm_sdcc.1/by-name/cache          	/cache       		f2fs    rw,discard,nosuid,nodev,noatime,nodiratime,inline_xattr			        wait,check
 /dev/block/platform/msm_sdcc.1/by-name/drm            	/persist-lg  		ext4    nosuid,nodev,barrier=1,data=ordered                                             wait,check
 /dev/block/platform/msm_sdcc.1/by-name/mpt            	/mpt         		ext4    nosuid,nodev,barrier=1,data=ordered                                             wait,check
 /dev/block/platform/msm_sdcc.1/by-name/sns            	/sns         		ext4    nosuid,nodev,barrier=1,data=ordered                                             wait,check