[PATCH][2.5] pci_siig* interdependence

[PATCH][2.5] pci_siig* interdependence

[Zwane Mwaikambo]

Hi Russell,
This patch is to fix a compilation problem (functions are shared with
parport_serial) as well as fix a potential oops (parport_serial as module
would try and reference the freed memory)

Russell am i missing something?

Index: linux-2.5.50/drivers/serial/8250_pci.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.50/drivers/serial/8250_pci.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 8250_pci.c
--- linux-2.5.50/drivers/serial/8250_pci.c	28 Nov 2002 01:34:30 -0000	1.1.1.1
+++ linux-2.5.50/drivers/serial/8250_pci.c	28 Nov 2002 05:08:38 -0000
@@ -267,7 +267,7 @@
 #define PCI_DEVICE_ID_SIIG_1S_10x (PCI_DEVICE_ID_SIIG_1S_10x_550 & 0xfffc)
 #define PCI_DEVICE_ID_SIIG_2S_10x (PCI_DEVICE_ID_SIIG_2S_10x_550 & 0xfff8)

-static int __devinit pci_siig10x_fn(struct pci_dev *dev, int enable)
+int pci_siig10x_fn(struct pci_dev *dev, int enable)
 {
 	u16 data, *p;

@@ -298,7 +298,7 @@
 #define PCI_DEVICE_ID_SIIG_2S_20x (PCI_DEVICE_ID_SIIG_2S_20x_550 & 0xfffc)
 #define PCI_DEVICE_ID_SIIG_2S1P_20x (PCI_DEVICE_ID_SIIG_2S1P_20x_550 & 0xfffc)

-static int __devinit pci_siig20x_fn(struct pci_dev *dev, int enable)
+int pci_siig20x_fn(struct pci_dev *dev, int enable)
 {
 	u8 data;

-- 
function.linuxpower.ca

Re: [PATCH][2.5] pci_siig* interdependence

[Andrey Panin]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

On Чтв, Ноя 28, 2002 at 03:39:08 -0500, Zwane Mwaikambo wrote:

> This patch is to fix a compilation problem (functions are shared with
> parport_serial) as well as fix a potential oops (parport_serial as module
> would try and reference the freed memory)

The problem you are seeing caused by semiapplied patch moving SIIG combo
cards support from 8250_pci.c to parport_serial.c
Parport patch already applied, while serial one still isn't.

-- 
Andrey Panin            | Embedded systems software developer
pazke@orbita1.ru        | PGP key: wwwkeys.eu.pgp.net

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]

Re: [PATCH][2.5] pci_siig* interdependence

[Russell King]

On Fri, Nov 29, 2002 at 11:51:34AM +0300, Andrey Panin wrote:
> > This patch is to fix a compilation problem (functions are shared with
> > parport_serial) as well as fix a potential oops (parport_serial as module
> > would try and reference the freed memory)
> 
> The problem you are seeing caused by semiapplied patch moving SIIG combo
> cards support from 8250_pci.c to parport_serial.c
> Parport patch already applied, while serial one still isn't.

Why didn't whoever integrated the patch apply both halves.  Applying
one half without the other breaks things, and without proper co-ordination
between two people applying the exact same patch (which obviously didn't
happen) you can expect breakage.

-- 
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html