Merge branch 'master' of http://1.116.144.8:6314/joe/C180_oyster_driver

gsensor.c

@@ -199,9 +199,9 @@ static enum gsensor_orientation_hex gsensor_calc_orientation(int x, int y,
 
     if (abs_y > 800 && abs_y > abs_x) {
         if (y > 0)
-            return GSENSOR_ORIENT_PORTRAIT_FLIP_HEX;
-        else
             return GSENSOR_ORIENT_PORTRAIT_HEX;
+        else
+            return GSENSOR_ORIENT_PORTRAIT_FLIP_HEX;
     }
 
     return GSENSOR_ORIENT_UNKNOWN_HEX;