From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sat, 23 Aug 2008 00:00:44 +0000 (+0200)
Subject: Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmcia
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff08705860f3e92ea5233989b4a2384ebb421f26;p=mv-sheeva.git

Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmcia

* pcmcia-config-loop:
  pcmcia: pcmcia_config_loop() improvement by passing vcc
  pcmcia: pcmcia_config_loop() default CIS entry handling
  pcmcia: pcmcia_config_loop() ConfigIndex unification
  pcmcia: use pcmcia_loop_config in misc pcmcia drivers
  pcmcia: use pcmcia_loop_config in net pcmcia drivers
  pcmcia: use pcmcia_loop_config in ISDN pcmcia drivers
  pcmcia: use pcmcia_loop_config in scsi pcmcia drivers
  pcmcia: use pcmcia_loop_config in bluetooth drivers
  pcmcia: use pcmcia_loop_config in pata and ide drivers
  pcmcia: add pcmcia_loop_config() helper

* pcmcia-printk:
  pcmcia: don't add extra DEBUG cflag
  pcmcia: remove unused cs_socket_name() definition
  pcmcia: use dev_printk in module rsrc_nonstatic
  pcmcia: use dev_printk in module pcmcia
  pcmcia: use dev_printk in module pcmcia_core
  pcmcia: use dev_printk and dev_dbg in yenta_socket
---

ff08705860f3e92ea5233989b4a2384ebb421f26
diff --cc drivers/pcmcia/ds.c
index 2382341975e,4174d9656e3,6501a968a64..a393501554a
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@@@ -876,10 -877,19 -889,20 +888,11 @@@@ static int pcmcia_load_firmware(struct 
   			goto release;
   		}
   
 --		cis = kzalloc(sizeof(cisdump_t), GFP_KERNEL);
 --		if (!cis) {
 --			ret = -ENOMEM;
 --			goto release;
 --		}
 --
 --		cis->Length = fw->size + 1;
 --		memcpy(cis->Data, fw->data, fw->size);
 --
 --		if (!pcmcia_replace_cis(s, cis))
 ++		if (!pcmcia_replace_cis(s, fw->data, fw->size))
   			ret = 0;
   		else {
-- 			printk(KERN_ERR "pcmcia: CIS override failed\n");
++ 			dev_printk(KERN_ERR, &dev->dev,
++ 				   "pcmcia: CIS override failed\n");
   			goto release;
   		}