diff --git a/[refs] b/[refs] index fc61bbcc176a..36f0ab747193 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3edf2fb9d80a46d6c32ba12547a42419845b4b76 +refs/heads/master: 06739a8ad321b1e5140b318c648b0cc4bf8c6daa diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c index 3c57c1a18bb8..d593bc76afe3 100644 --- a/trunk/drivers/s390/cio/device.c +++ b/trunk/drivers/s390/cio/device.c @@ -772,10 +772,8 @@ static struct ccw_device * io_subchannel_create_ccwdev(struct subchannel *sch) cdev = io_subchannel_allocate_dev(sch); if (!IS_ERR(cdev)) { ret = io_subchannel_initialize_dev(sch, cdev); - if (ret) { - kfree(cdev); + if (ret) cdev = ERR_PTR(ret); - } } return cdev; }