summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max77843.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-11-02 23:09:24 +0100
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-11-02 23:09:24 +0100
commitac3c860c758a864adb1dd5c7d68dadebe6c86f64 (patch)
tree62c2bd4214874d583f6ef5eb898604e4a1b3d44c /drivers/mfd/max77843.c
parentpNFS/flexfiles: Add support for FF_FLAGS_NO_IO_THRU_MDS (diff)
parentNFS: Enable client side NFSv4.1 backchannel to use other transports (diff)
downloadlinux-ac3c860c758a864adb1dd5c7d68dadebe6c86f64.tar.xz
linux-ac3c860c758a864adb1dd5c7d68dadebe6c86f64.zip
Merge tag 'nfs-rdma-4.4-2' of git://git.linux-nfs.org/projects/anna/nfs-rdma
NFS: NFSoRDMA Client Side Changes In addition to a variety of bugfixes, these patches are mostly geared at enabling both swap and backchannel support to the NFS over RDMA client. Signed-off-by: Anna Schumake <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'drivers/mfd/max77843.c')
-rw-r--r--drivers/mfd/max77843.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/max77843.c b/drivers/mfd/max77843.c
index c52162ea3d0a..586098f1b233 100644
--- a/drivers/mfd/max77843.c
+++ b/drivers/mfd/max77843.c
@@ -80,7 +80,7 @@ static int max77843_chg_init(struct max77693_dev *max77843)
if (!max77843->i2c_chg) {
dev_err(&max77843->i2c->dev,
"Cannot allocate I2C device for Charger\n");
- return PTR_ERR(max77843->i2c_chg);
+ return -ENODEV;
}
i2c_set_clientdata(max77843->i2c_chg, max77843);