diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-19 13:12:18 +0000 |
| commit | c9e48084c88cf901ad0d99a889f2628a5622d90b (patch) | |
| tree | e95ef2305fa14e0c6e218a6aba8de8df4a0b5798 /drivers/parport/probe.c | |
| parent | regulator: axp20x: Use rdev_get_id at appropriate places (diff) | |
| parent | Linux 5.1-rc1 (diff) | |
| download | linux-dev-c9e48084c88cf901ad0d99a889f2628a5622d90b.tar.xz linux-dev-c9e48084c88cf901ad0d99a889f2628a5622d90b.zip | |
Merge tag 'v5.1-rc1' into regulator-5.2
Linux 5.1-rc1
Diffstat (limited to 'drivers/parport/probe.c')
| -rw-r--r-- | drivers/parport/probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c index e035174ba205..e5e6a463a941 100644 --- a/drivers/parport/probe.c +++ b/drivers/parport/probe.c @@ -257,7 +257,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer, ssize_t parport_device_id (int devnum, char *buffer, size_t count) { ssize_t retval = -ENXIO; - struct pardevice *dev = parport_open (devnum, "Device ID probe"); + struct pardevice *dev = parport_open(devnum, daisy_dev_name); if (!dev) return -ENXIO; |