From: Ian Abbott Date: Thu, 7 Feb 2013 16:03:00 +0000 (+0000) Subject: staging: comedi: don't return minor from comedi_alloc_subdevice_minor() X-Git-Tag: firefly_0821_release~3680^2~1080^2~64 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=da7185462e86b4832342d7e02e52b889126a0fcf;p=firefly-linux-kernel-4.4.55.git staging: comedi: don't return minor from comedi_alloc_subdevice_minor() `comedi_alloc_subdevice_minor()` currently returns the allocated minor device number on success. This is not really of any interest to the caller (in fact the return value is not even checked), so just return 0 on success. If the caller really needs to know the allocated minor device number it can look in `s->minor`. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index b1e8cdbd1ce7..4f587ea13634 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -2383,7 +2383,7 @@ int comedi_alloc_subdevice_minor(struct comedi_subdevice *s) s->class_dev = csdev; dev_set_drvdata(csdev, info); - return i; + return 0; } void comedi_free_subdevice_minor(struct comedi_subdevice *s)