From 958d861f8d74142bb638482d6c05c4bca5c1421f Mon Sep 17 00:00:00 2001 From: Luciano Coelho Date: Mon, 11 Feb 2013 10:21:18 +0200 Subject: [PATCH] --- yaml --- r: 352639 b: refs/heads/master c: f1045f5e1f4f7d94f4e3a9600e3a3c3eec2650ec h: refs/heads/master i: 352637: 19411214a1c926a65c1ca02283b593238ecc03b6 352635: c2b3197249494b708b7c64369c9c8ac5c81c2bc7 352631: 9b27e258d0dada3ad12477b2e34c6b490d61a08d 352623: e8d4d538fcfa5a993ac9c6eef35d0215a601cf7b 352607: 9b80e872ad86d92a3cd004f5d1362a00ca6b704e 352575: 49ad5f5c0c75e93834c3c6529bd1517b4022ccde 352511: b38dfb9b2fd0a58f80af963c13211da48413a680 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/sdio.c | 4 +--- trunk/drivers/net/wireless/ti/wlcore/spi.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 95e051d21b4e..940d9d1a25a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9d76a045f2883f2e6cf00a43cb79b2e5a8db323 +refs/heads/master: f1045f5e1f4f7d94f4e3a9600e3a3c3eec2650ec diff --git a/trunk/drivers/net/wireless/ti/wlcore/sdio.c b/trunk/drivers/net/wireless/ti/wlcore/sdio.c index 198028df6f4b..29ef2492951f 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/sdio.c +++ b/trunk/drivers/net/wireless/ti/wlcore/sdio.c @@ -229,10 +229,8 @@ static int wl1271_probe(struct sdio_func *func, return -ENODEV; pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); - if (!pdev_data) { - dev_err(&func->dev, "can't allocate platdev_data\n"); + if (!pdev_data) goto out; - } pdev_data->if_ops = &sdio_ops; diff --git a/trunk/drivers/net/wireless/ti/wlcore/spi.c b/trunk/drivers/net/wireless/ti/wlcore/spi.c index 5ad2e100e59b..e26447832683 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/spi.c +++ b/trunk/drivers/net/wireless/ti/wlcore/spi.c @@ -332,10 +332,8 @@ static int wl1271_probe(struct spi_device *spi) int ret = -ENOMEM; pdev_data = kzalloc(sizeof(*pdev_data), GFP_KERNEL); - if (!pdev_data) { - dev_err(&spi->dev, "can't allocate platdev_data\n"); + if (!pdev_data) goto out; - } pdev_data->pdata = spi->dev.platform_data; if (!pdev_data->pdata) {