diff --git a/[refs] b/[refs] index 9ca45af1e82c..a9acc5f7aae3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5e86db4c7f6397ef86ab5e4a3fbece966935577 +refs/heads/master: 58f3e0a864c46dadbeadf682e6bbdcab14ba19d3 diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c index 73cac6c78cb6..2cd6109b8586 100644 --- a/trunk/drivers/net/niu.c +++ b/trunk/drivers/net/niu.c @@ -9542,7 +9542,7 @@ static struct niu_parent * __devinit niu_new_parent(struct niu *np, plat_dev = platform_device_register_simple("niu", niu_parent_index, NULL, 0); - if (!plat_dev) + if (IS_ERR(plat_dev)) return NULL; for (i = 0; attr_name(niu_parent_attributes[i]); i++) {