summaryrefslogtreecommitdiffstats
path: root/drivers/misc/pmic_fsl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/pmic_fsl.c')
-rw-r--r--drivers/misc/pmic_fsl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/misc/pmic_fsl.c b/drivers/misc/pmic_fsl.c
index b6e809a188..0ff75ed76e 100644
--- a/drivers/misc/pmic_fsl.c
+++ b/drivers/misc/pmic_fsl.c
@@ -29,10 +29,7 @@
#if defined(CONFIG_PMIC_SPI)
static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
{
- if ((val == NULL) && (write))
- return *val & ~(1 << 31);
- else
- return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
+ return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
}
#endif
OpenPOWER on IntegriCloud