projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[linux-2.6-block.git]
/
drivers
/
mfd
/
da9052-spi.c
diff --git
a/drivers/mfd/da9052-spi.c
b/drivers/mfd/da9052-spi.c
index 71b89dd4e8de26297b5487cd2c42c1e19dcbcba3..b9ea1b27db642d452b39ceaf1a5a96fa9657804c 100644
(file)
--- a/
drivers/mfd/da9052-spi.c
+++ b/
drivers/mfd/da9052-spi.c
@@
-56,11
+56,7
@@
static int da9052_spi_probe(struct spi_device *spi)
return ret;
}
- ret = da9052_device_init(da9052, id->driver_data);
- if (ret != 0)
- return ret;
-
- return 0;
+ return da9052_device_init(da9052, id->driver_data);
}
static int da9052_spi_remove(struct spi_device *spi)