]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
power_supply: bq25890: make chip_id int
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Tue, 2 Jun 2015 10:36:51 +0000 (13:36 +0300)
committerSebastian Reichel <sre@kernel.org>
Tue, 2 Jun 2015 18:58:19 +0000 (20:58 +0200)
Smatch static checker correctly detected an impossible condition because
chip_id was declared as u8, instead of int:

drivers/power/bq25890_charger.c:843 bq25890_probe()
warn: impossible condition '(bq->chip_id < 0) => (0-255 < 0)'

Also, while at it, fix the return value too.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/bq25890_charger.c

index c7b4903acd758079c79a7b3b3f4e37b3ac51113c..16b7c7bc987dc46177c1b5e17fbe81b9443a7809 100644 (file)
@@ -99,7 +99,7 @@ struct bq25890_device {
        struct regmap *rmap;
        struct regmap_field *rmap_fields[F_MAX_FIELDS];
 
-       u8 chip_id;
+       int chip_id;
        struct bq25890_init_data init_data;
        struct bq25890_state state;
 
@@ -842,7 +842,7 @@ static int bq25890_probe(struct i2c_client *client,
        bq->chip_id = bq25890_field_read(bq, F_PN);
        if (bq->chip_id < 0) {
                dev_err(dev, "Cannot read chip ID.\n");
-               return ret;
+               return bq->chip_id;
        }
 
        if (bq->chip_id != BQ25890_ID) {