diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2018-01-19 04:09:57 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2018-01-19 04:09:57 +0300 |
| commit | d27998185da8fbdc35911307ae13518d168778d7 (patch) | |
| tree | 4c5a99fd7cff7c9da1f858fdfccf8dc1cc6c597b /drivers/clk/clk-mux.c | |
| parent | 00608e1f007e4cf6031485c5630e0e504bceef9b (diff) | |
| parent | d075745d893c78730e4a3b7a60fca23c2f764081 (diff) | |
| download | linux-d27998185da8fbdc35911307ae13518d168778d7.tar.xz | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the ppc-kvm topic branch of the powerpc tree to get
two patches which are prerequisites for the following patch series,
plus another patch which touches both powerpc and KVM code.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'drivers/clk/clk-mux.c')
| -rw-r--r-- | drivers/clk/clk-mux.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index 16a3d5717f4e..39cabe157163 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -134,11 +134,9 @@ struct clk_hw *clk_hw_register_mux_table(struct device *dev, const char *name, } /* allocate the mux */ - mux = kzalloc(sizeof(struct clk_mux), GFP_KERNEL); - if (!mux) { - pr_err("%s: could not allocate mux clk\n", __func__); + mux = kzalloc(sizeof(*mux), GFP_KERNEL); + if (!mux) return ERR_PTR(-ENOMEM); - } init.name = name; if (clk_mux_flags & CLK_MUX_READ_ONLY) |