Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec004407 authored by Michael Ernst's avatar Michael Ernst Committed by Martin Schwidefsky
Browse files

[S390] cio: channel path memory leak 



Move dev_set_name to when we know that the device will actually be
registered in order to avoid a memory leak if the allocated memory
for the channel path has to be freed.

Signed-off-by: default avatarMichael Ernst <mernst@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6a03f5f0

drivers/s390/cio/chp.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,6 @@ int chp_new(struct chp_id chpid) 
	chp->state = 1;

	chp->dev.parent = &channel_subsystems[chpid.cssid]->device;

	chp->dev.release = chp_release;

	dev_set_name(&chp->dev, "chp%x.%02x", chpid.cssid, chpid.id);



	/* Obtain channel path description and fill it in. */

	ret = chsc_determine_base_channel_path_desc(chpid, &chp->desc);
@@ -411,6 +410,7 @@ int chp_new(struct chp_id chpid) 
	} else {

		chp->cmg = -1;

	}

	dev_set_name(&chp->dev, "chp%x.%02x", chpid.cssid, chpid.id);



	/* make it known to the system */

	ret = device_register(&chp->dev);