X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=drivers%2Fmfd%2Fmenelaus.c;fp=drivers%2Fmfd%2Fmenelaus.c;h=f24df8c9b02ec5aa2b0b365f25141e219da26212;hb=59a9f7a32adf6537b4e4db8ca204eeb77d7a634e;hp=9b72a44ab60b4a3533c0ad758c33ea6bfdcbefef;hpb=fae01582ce9e01283514e00073868635865b8fb4;p=firefly-linux-kernel-4.4.55.git

diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c
index 9b72a44ab60b..f24df8c9b02e 100644
--- a/drivers/mfd/menelaus.c
+++ b/drivers/mfd/menelaus.c
@@ -442,7 +442,7 @@ void menelaus_unregister_mmc_callback(void)
 	menelaus_remove_irq_work(MENELAUS_MMC_S2D1_IRQ);
 
 	the_menelaus->mmc_callback = NULL;
-	the_menelaus->mmc_callback_data = 0;
+	the_menelaus->mmc_callback_data = NULL;
 }
 EXPORT_SYMBOL(menelaus_unregister_mmc_callback);
 
@@ -466,7 +466,7 @@ static int menelaus_set_voltage(const struct menelaus_vtg *vtg, int mV,
 	struct i2c_client *c = the_menelaus->client;
 
 	mutex_lock(&the_menelaus->lock);
-	if (vtg == 0)
+	if (!vtg)
 		goto set_voltage;
 
 	ret = menelaus_read_reg(vtg->vtg_reg);