From: Pavel Roskin <proski@gnu.org>
Date: Fri, 8 Jul 2005 00:59:04 +0000 (-0700)
Subject: [PATCH] pcmcia: remove client services version (fix)
X-Git-Tag: v2.6.13-rc3~140
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2ffe6e280f792790c39f241e7e3c5d2ef8da1b94;p=linux-2.6-omap-h63xx.git

[PATCH] pcmcia: remove client services version (fix)

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>
---

diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 506bbb446e5..c8755adfd91 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -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");