diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /drivers/s390/cio/device.c | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'drivers/s390/cio/device.c')
| -rw-r--r-- | drivers/s390/cio/device.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 3c57c1a18bb8..d593bc76afe3 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
| @@ -772,10 +772,8 @@ static struct ccw_device * io_subchannel_create_ccwdev(struct subchannel *sch) | |||
| 772 | cdev = io_subchannel_allocate_dev(sch); | 772 | cdev = io_subchannel_allocate_dev(sch); |
| 773 | if (!IS_ERR(cdev)) { | 773 | if (!IS_ERR(cdev)) { |
| 774 | ret = io_subchannel_initialize_dev(sch, cdev); | 774 | ret = io_subchannel_initialize_dev(sch, cdev); |
| 775 | if (ret) { | 775 | if (ret) |
| 776 | kfree(cdev); | ||
| 777 | cdev = ERR_PTR(ret); | 776 | cdev = ERR_PTR(ret); |
| 778 | } | ||
| 779 | } | 777 | } |
| 780 | return cdev; | 778 | return cdev; |
| 781 | } | 779 | } |