Merge tag 'staging-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / media / omap4iss / iss.c

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 96b14b3..cc1dfad 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -1357,10 +1357,8 @@ static int iss_probe(struct platform_device *pdev)
                return -EINVAL;
 
        iss = devm_kzalloc(&pdev->dev, sizeof(*iss), GFP_KERNEL);
-       if (!iss) {
-               dev_err(&pdev->dev, "Could not allocate memory\n");
+       if (!iss)
                return -ENOMEM;
-       }
 
        mutex_init(&iss->iss_mutex);