瀏覽代碼

staging: comedi: comedi_bond: use correct minor device numbers in name

The board name for "comedi_bond" is constructed from a space-separated
list of items of the form "minor:subdevice" where "minor" is a minor
device number and "subdevice" is a subdevice number.  Currently, all the
"minor" device numbers are for the "comedi_bond" device itself and the
"subdevice" numbers are for the bonded devices.  It makes makes more
sense for the "minor" device numbers to come from the bonded devices as
well so that the string is a list of bonded "minor:subdevice" pairs.
Fix it.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ian Abbott 12 年之前
父節點
當前提交
7322b320d6
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/staging/comedi/drivers/comedi_bond.c

+ 2 - 2
drivers/staging/comedi/drivers/comedi_bond.c

@@ -263,8 +263,8 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
 				char buf[20];
 				char buf[20];
 				int left =
 				int left =
 				    MAX_BOARD_NAME - strlen(devpriv->name) - 1;
 				    MAX_BOARD_NAME - strlen(devpriv->name) - 1;
-				snprintf(buf, sizeof(buf), "%d:%d ", dev->minor,
-					 bdev->subdev);
+				snprintf(buf, sizeof(buf), "%d:%d ",
+					 bdev->minor, bdev->subdev);
 				buf[sizeof(buf) - 1] = 0;
 				buf[sizeof(buf) - 1] = 0;
 				strncat(devpriv->name, buf, left);
 				strncat(devpriv->name, buf, left);
 			}
 			}