diff options
| author | Greg Kroah-Hartman | 2016-10-30 11:38:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-10-30 11:38:44 +0100 |
| commit | bdc065666a591fddc4e55cbdcd6c7b02f289b5ff (patch) | |
| tree | acb92182d7c28a8d5176feb99fd7fb110a693ab7 /drivers/staging/greybus/uart.c | |
| parent | staging: vc04_services: use bcm2835 consequently (diff) | |
| parent | Linux 4.9-rc3 (diff) | |
| download | kernel-qcow2-linux-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.tar.gz kernel-qcow2-linux-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.tar.xz kernel-qcow2-linux-bdc065666a591fddc4e55cbdcd6c7b02f289b5ff.zip | |
Merge 4.9-rc3 into staging-next
This resolves a merge issue with
drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in
here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/greybus/uart.c')
| -rw-r--r-- | drivers/staging/greybus/uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/greybus/uart.c b/drivers/staging/greybus/uart.c index 8162886bcaed..c1f6abb57dc3 100644 --- a/drivers/staging/greybus/uart.c +++ b/drivers/staging/greybus/uart.c @@ -888,7 +888,7 @@ static int gb_uart_probe(struct gbphy_device *gbphy_dev, minor = alloc_minor(gb_tty); if (minor < 0) { if (minor == -ENOSPC) { - dev_err(&connection->bundle->dev, + dev_err(&gbphy_dev->dev, "no more free minor numbers\n"); retval = -ENODEV; } else { |