.. | .. |
---|
530 | 530 | power_zone->name = kstrdup(name, GFP_KERNEL); |
---|
531 | 531 | if (!power_zone->name) |
---|
532 | 532 | goto err_name_alloc; |
---|
533 | | - dev_set_name(&power_zone->dev, "%s:%x", |
---|
534 | | - dev_name(power_zone->dev.parent), |
---|
535 | | - power_zone->id); |
---|
536 | 533 | power_zone->constraints = kcalloc(nr_constraints, |
---|
537 | 534 | sizeof(*power_zone->constraints), |
---|
538 | 535 | GFP_KERNEL); |
---|
.. | .. |
---|
555 | 552 | power_zone->dev_attr_groups[0] = &power_zone->dev_zone_attr_group; |
---|
556 | 553 | power_zone->dev_attr_groups[1] = NULL; |
---|
557 | 554 | power_zone->dev.groups = power_zone->dev_attr_groups; |
---|
| 555 | + dev_set_name(&power_zone->dev, "%s:%x", |
---|
| 556 | + dev_name(power_zone->dev.parent), |
---|
| 557 | + power_zone->id); |
---|
558 | 558 | result = device_register(&power_zone->dev); |
---|
559 | | - if (result) |
---|
560 | | - goto err_dev_ret; |
---|
| 559 | + if (result) { |
---|
| 560 | + put_device(&power_zone->dev); |
---|
| 561 | + mutex_unlock(&control_type->lock); |
---|
| 562 | + |
---|
| 563 | + return ERR_PTR(result); |
---|
| 564 | + } |
---|
561 | 565 | |
---|
562 | 566 | control_type->nr_zones++; |
---|
563 | 567 | mutex_unlock(&control_type->lock); |
---|