]> err.no Git - linux-2.6/commitdiff
[PATCH] pcmcia: remove client services version (fix)
authorPavel Roskin <proski@gnu.org>
Fri, 8 Jul 2005 00:59:04 +0000 (17:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 8 Jul 2005 01:24:06 +0000 (18:24 -0700)
One correction is needed.  Changes are not needed for
drivers/scsi/pcmcia/nsp_cs.c because it uses versioning in the
compatibility part, which is never used in 2.6 kernels.  The only right
thing we could to that compatibility code would be to remove it throughout
the file, but that would be a separate patch.

Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/scsi/pcmcia/nsp_cs.c

index 506bbb446e5e0e5f5f156914fa3d80ec9402e487..c8755adfd917e616942c2ed1486cb6dd7b697425 100644 (file)
@@ -2155,6 +2155,10 @@ static int __init nsp_cs_init(void)
 
        nsp_msg(KERN_INFO, "loading...");
        pcmcia_get_card_services_info(&serv);
+       if (serv.Revision != CS_RELEASE_CODE) {
+               nsp_msg(KERN_DEBUG, "Card Services release does not match!");
+               return -EINVAL;
+       }
        register_pcmcia_driver(&dev_info, &nsp_cs_attach, &nsp_cs_detach);
 
        nsp_dbg(NSP_DEBUG_INIT, "out");