diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:34:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-01 07:34:09 +0200 |
| commit | 62fa78436e1beb17210df25b38c347ccb44b396b (patch) | |
| tree | 9ebfa63bf46296150d11708fdabd2abbfb163fa5 /drivers/parport/probe.c | |
| parent | firmware: vpd: Drop __iomem usage for memremap() memory (diff) | |
| parent | Linux 5.1-rc3 (diff) | |
| download | wireguard-linux-62fa78436e1beb17210df25b38c347ccb44b396b.tar.xz wireguard-linux-62fa78436e1beb17210df25b38c347ccb44b396b.zip | |
Merge 5.1-rc3 into char-misc-next
We want the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 e5e6a463a941..e035174ba205 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, daisy_dev_name); + struct pardevice *dev = parport_open (devnum, "Device ID probe"); if (!dev) return -ENXIO; |