Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / drivers / watchdog / pic32-dmt.c

diff --git a/drivers/watchdog/pic32-dmt.c b/drivers/watchdog/pic32-dmt.c
index 962f58c03353b8541a7101920b207541b0e7fc89..c797305f8338cb4ed61e64fecf71b3698994a36a 100644 (file)
--- a/drivers/watchdog/pic32-dmt.c
+++ b/drivers/watchdog/pic32-dmt.c
@@ -176,8 +176,8 @@ static int pic32_dmt_probe(struct platform_device *pdev)
        struct watchdog_device *wdd = &pic32_dmt_wdd;
 
        dmt = devm_kzalloc(&pdev->dev, sizeof(*dmt), GFP_KERNEL);
-       if (IS_ERR(dmt))
-               return PTR_ERR(dmt);
+       if (!dmt)
+               return -ENOMEM;
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        dmt->regs = devm_ioremap_resource(&pdev->dev, mem);
@@ -245,7 +245,6 @@ static struct platform_driver pic32_dmt_driver = {
        .remove         = pic32_dmt_remove,
        .driver         = {
                .name           = "pic32-dmt",
-               .owner          = THIS_MODULE,
                .of_match_table = of_match_ptr(pic32_dmt_of_ids),
        }
 };