diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-06 21:10:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-06 21:10:05 -0500 |
| commit | 959327c7842e8621e28b89acea7d57ff02b60972 (patch) | |
| tree | b00de195fa401186228796abdcd16812862fbf4d /drivers/net/xen-netback | |
| parent | f84ea779c25dabc90956f1c329e5e5c501ea96cc (diff) | |
| parent | b835c0f47f725d864bf2545f10c733b754bb6d51 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/xen-netback')
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index d2ffe9cd29c3..639cf8ab62ba 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c | |||
| @@ -1664,7 +1664,7 @@ static int __init netback_init(void) | |||
| 1664 | "netback/%u", group); | 1664 | "netback/%u", group); |
| 1665 | 1665 | ||
| 1666 | if (IS_ERR(netbk->task)) { | 1666 | if (IS_ERR(netbk->task)) { |
| 1667 | printk(KERN_ALERT "kthread_run() fails at netback\n"); | 1667 | printk(KERN_ALERT "kthread_create() fails at netback\n"); |
| 1668 | del_timer(&netbk->net_timer); | 1668 | del_timer(&netbk->net_timer); |
| 1669 | rc = PTR_ERR(netbk->task); | 1669 | rc = PTR_ERR(netbk->task); |
| 1670 | goto failed_init; | 1670 | goto failed_init; |