Merge tag 'fixes-for-v4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-rx8025.c

diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index 24c3d69ce1b97887485a2d668716a439c0a7625a..bd911bafb809a2ede1c46c3f2e2877ac7507fc50 100644 (file)
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -65,6 +65,7 @@
 
 static const struct i2c_device_id rx8025_id[] = {
        { "rx8025", 0 },
+       { "rv8803", 1 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, rx8025_id);
@@ -518,9 +519,8 @@ static int rx8025_probe(struct i2c_client *client,
        }
 
        rx8025 = devm_kzalloc(&client->dev, sizeof(*rx8025), GFP_KERNEL);
-       if (!rx8025) {
+       if (!rx8025)
                return -ENOMEM;
-       }
 
        rx8025->client = client;
        i2c_set_clientdata(client, rx8025);