Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[uclinux-h8/linux.git] / drivers / staging / most / hdm-dim2 / dim2_hdm.c

diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c
index 0dc86ad..a364495 100644 (file)
--- a/drivers/staging/most/hdm-dim2/dim2_hdm.c
+++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c
@@ -771,7 +771,7 @@ static int dim2_probe(struct platform_device *pdev)
        dev->netinfo_task = kthread_run(&deliver_netinfo_thread, (void *)dev,
                                        "dim2_netinfo");
        if (IS_ERR(dev->netinfo_task))
-               ret = PTR_ERR(dev->netinfo_task);
+               return PTR_ERR(dev->netinfo_task);
 
        for (i = 0; i < DMA_CHANNELS; i++) {
                struct most_channel_capability *cap = dev->capabilities + i;