X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fhardware-intel-libsensors.git;a=blobdiff_plain;f=accel-calibration.c;h=930e3598c2a6243580fa0b13da95aaa44e3545af;hp=aa67eceb0fedeaeba4692b7d03391b0fd3cec917;hb=refs%2Fheads%2Foreo-x86;hpb=26d12ba0c4a396579a141e2b19212628d60f9167 diff --git a/accel-calibration.c b/accel-calibration.c index aa67ece..930e359 100644 --- a/accel-calibration.c +++ b/accel-calibration.c @@ -1,6 +1,18 @@ /* - * Copyright (C) 2014-2015 Intel Corporation. - */ +// Copyright (c) 2015 Intel Corporation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +*/ #include #include @@ -181,7 +193,7 @@ void accel_cal_init (int s) } /* Fall back to initial values */ - memset(cal_data, sizeof(accel_cal_t), 0); + memset(cal_data, 0, sizeof(accel_cal_t)); /* Store the parameters that are used with that data set, so we can check them against future version of the code to prevent inadvertent reuse */ cal_data->version = (ACCEL_CALIB_DATA_VERSION << 16) + sizeof(accel_cal_t); @@ -201,7 +213,8 @@ void accel_cal_store (int s) fd = open(ACCEL_CALIBRATION_PATH, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR); - write(fd, cal_data, sizeof(accel_cal_t)); - - close(fd); + if (fd != -1) { + write(fd, cal_data, sizeof(accel_cal_t)); + close(fd); + } }