Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354800
b: refs/heads/master
c: f5836a5
h: refs/heads/master
v: v3
  • Loading branch information
Heikki Krogerus authored and Greg Kroah-Hartman committed Jan 16, 2013
1 parent 385665d commit a7c489e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 053fac36b1d9f76adde96a2f731965aaab3c632b
refs/heads/master: f5836a55dee705d47a16c32139c02721763ff699
6 changes: 4 additions & 2 deletions trunk/drivers/tty/serial/8250/8250_dw.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ dw8250_acpi_walk_resource(struct acpi_resource *res, void *data)
slave->direction = DMA_MEM_TO_DEV;
slave->dst_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
slave->slave_id = fixed_dma->request_lines;
slave->dst_maxburst = port->tx_loadsz / 4;

dma->tx_chan_id = fixed_dma->channels;
dma->tx_param = &dma->tx_chan_id;
Expand All @@ -189,6 +190,7 @@ dw8250_acpi_walk_resource(struct acpi_resource *res, void *data)
slave->direction = DMA_DEV_TO_MEM;
slave->src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE;
slave->slave_id = fixed_dma->request_lines;
slave->src_maxburst = p->fifosize / 4;

dma->rx_chan_id = fixed_dma->channels;
dma->rx_param = &dma->rx_chan_id;
Expand Down Expand Up @@ -296,6 +298,8 @@ static int dw8250_probe(struct platform_device *pdev)
uart.port.serial_in = dw8250_serial_in;
uart.port.serial_out = dw8250_serial_out;

dw8250_setup_port(&uart);

if (pdev->dev.of_node) {
err = dw8250_probe_of(&uart.port);
if (err)
Expand All @@ -308,8 +312,6 @@ static int dw8250_probe(struct platform_device *pdev)
return -ENODEV;
}

dw8250_setup_port(&uart);

data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
Expand Down

0 comments on commit a7c489e

Please sign in to comment.