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

Commit 35841f70 authored by Borislav Petkov's avatar Borislav Petkov Committed by Linus Torvalds
Browse files

drivers/cdrom/cdrom.c: simplify logic in cdrom_release() 



Simplify logic in cdrom_release() without semantic change.

Signed-off-by: default avatarBorislav Petkov <bbpetkov@yahoo.de>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 18a2354d

drivers/cdrom/cdrom.c

+9 −8
Original line number Diff line number Diff line
@@ -1206,7 +1206,6 @@ int check_for_audio_disc(struct cdrom_device_info * cdi, 
	return 0;

}



/* Admittedly, the logic below could be performed in a nicer way. */

int cdrom_release(struct cdrom_device_info *cdi, struct file *fp)

{

	struct cdrom_device_ops *cdo = cdi->ops;
@@ -1216,15 +1215,17 @@ int cdrom_release(struct cdrom_device_info *cdi, struct file *fp) 


	if (cdi->use_count > 0)

		cdi->use_count--;

	if (cdi->use_count == 0)



	if (cdi->use_count == 0) {

		cdinfo(CD_CLOSE, "Use count for \"/dev/%s\" now zero\n", cdi->name);

	if (cdi->use_count == 0)

		cdrom_dvd_rw_close_write(cdi);

	if (cdi->use_count == 0 &&

	    (cdo->capability & CDC_LOCK) && !keeplocked) {



		if ((cdo->capability & CDC_LOCK) && !keeplocked) {

			cdinfo(CD_CLOSE, "Unlocking door!\n");

			cdo->lock_door(cdi, 0);

		}

	}



	opened_for_data = !(cdi->options & CDO_USE_FFLAGS) ||

		!(fp && fp->f_flags & O_NONBLOCK);