[parisc-linux-cvs] [PATCH] make lasi work for the 2.5 kernels on E-Class

[Ryan Bradetich]

--=-aLcynJOpJCTQrdxjmgxP
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Make sure the lasi audio device is valid before using.

I found/fixed this on for the E-Class in the linux-2.4 tree,
committing to the linux-2.5 tree as well.

- Ryan


--=-aLcynJOpJCTQrdxjmgxP
Content-Disposition: attachment; filename=lasi.diff
Content-Transfer-Encoding: quoted-printable
Content-Type: text/x-patch; name=lasi.diff; charset=ISO-8859-1

Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/linux-2.5/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile	16 Nov 2002 03:41:24 -0000	1.43
+++ Makefile	16 Nov 2002 17:48:11 -0000
@@ -1,7 +1,7 @@
 VERSION =3D 2
 PATCHLEVEL =3D 5
 SUBLEVEL =3D 47
-EXTRAVERSION =3D -pa4
+EXTRAVERSION =3D -pa5
=20
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
Index: drivers/parisc/lasi.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/linux-2.5/drivers/parisc/lasi.c,v
retrieving revision 1.3
diff -u -p -r1.3 lasi.c
--- drivers/parisc/lasi.c	5 Nov 2002 22:52:44 -0000	1.3
+++ drivers/parisc/lasi.c	16 Nov 2002 17:48:11 -0000
@@ -77,7 +77,8 @@ lasi_init_irq(struct busdevice *this_las
=20
 	/* Resets */
 	/* gsc_writel(0xFFFFFFFF, lasi_base+0x2000);*/	/* Parallel */
-	gsc_writel(0xFFFFFFFF, lasi_base+0x4004);	/* Audio */
+	if(pdc_add_valid(lasi_base+0x4004) =3D=3D PDC_OK)
+		gsc_writel(0xFFFFFFFF, lasi_base+0x4004);	/* Audio */
 	/* gsc_writel(0xFFFFFFFF, lasi_base+0x5000);*/	/* Serial */=20
 	/* gsc_writel(0xFFFFFFFF, lasi_base+0x6000);*/	/* SCSI */
 	gsc_writel(0xFFFFFFFF, lasi_base+0x7000);	/* LAN */

--=-aLcynJOpJCTQrdxjmgxP--