diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-02 12:52:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-02 12:52:05 -0800 |
| commit | 332808087a9a8a1693adcf66e4d7db730dd88796 (patch) | |
| tree | 84294191b8885b09dfb95c51360969eb2c5950bb /driver | |
| parent | 0e59a871d88555157ba9c585562efd7b44980a9a (diff) | |
| download | patches-332808087a9a8a1693adcf66e4d7db730dd88796.tar.gz | |
2.6.16-rc1-git6 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/handle-errors-returned-by-platform_get_irq.patch | 2 | ||||
| -rw-r--r-- | driver/spi-spi_butterfly-restore-lost-deltas.patch | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/driver/handle-errors-returned-by-platform_get_irq.patch b/driver/handle-errors-returned-by-platform_get_irq.patch index 6a717df6511b3..55e3f78f35cbc 100644 --- a/driver/handle-errors-returned-by-platform_get_irq.patch +++ b/driver/handle-errors-returned-by-platform_get_irq.patch @@ -260,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +++ gregkh-2.6/drivers/serial/s3c2410.c @@ -1062,6 +1062,8 @@ static int s3c24xx_serial_init_port(stru port->mapbase = res->start; - port->membase = S3C24XX_VA_UART + (res->start - S3C2410_PA_UART); + port->membase = S3C24XX_VA_UART + (res->start - S3C24XX_PA_UART); port->irq = platform_get_irq(platdev, 0); + if (port->irq < 0) + port->irq = 0; diff --git a/driver/spi-spi_butterfly-restore-lost-deltas.patch b/driver/spi-spi_butterfly-restore-lost-deltas.patch index f2cfa7ea588bb..b3329c73f9fef 100644 --- a/driver/spi-spi_butterfly-restore-lost-deltas.patch +++ b/driver/spi-spi_butterfly-restore-lost-deltas.patch @@ -17,8 +17,8 @@ Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> --- Documentation/spi/butterfly | 23 +++++++++++++++++------ drivers/spi/Kconfig | 10 ---------- - drivers/spi/spi_butterfly.c | 38 ++++++++++++++++++-------------------- - 3 files changed, 35 insertions(+), 36 deletions(-) + drivers/spi/spi_butterfly.c | 36 +++++++++++++++++------------------- + 3 files changed, 34 insertions(+), 35 deletions(-) --- gregkh-2.6.orig/drivers/spi/Kconfig +++ gregkh-2.6/drivers/spi/Kconfig @@ -62,10 +62,9 @@ Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> + */ if (spi_cs_bit == PARPORT_CONTROL_INIT) value = !value; -- + - /* here, value == "bit value to write in control register" */ - -+ parport_frob_control(pp->port, spi_cs_bit, value ? spi_cs_bit : 0); } |