Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-2.6-block.git] / drivers / net / phy / spi_ks8995.c

diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c
index 41eb8ffeb53d72b4357a02782238e0c34bdb42f7..5c87eef40bf9786ee27fae3980a33b6b0d0dfd1b 100644 (file)
--- a/drivers/net/phy/spi_ks8995.c
+++ b/drivers/net/phy/spi_ks8995.c
@@ -275,10 +275,8 @@ static int ks8995_probe(struct spi_device *spi)
        pdata = spi->dev.platform_data;
 
        ks = kzalloc(sizeof(*ks), GFP_KERNEL);
-       if (!ks) {
-               dev_err(&spi->dev, "no memory for private data\n");
+       if (!ks)
                return -ENOMEM;
-       }
 
        mutex_init(&ks->lock);
        ks->pdata = pdata;