Commit 49b766ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 

* 'urgent-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: do not load the pd6729 driver if io_base is NULL
  pcmcia: Fix possible printk format warnings
  pcmcia: do not try to store more than 4 version strings
  pcmcia: pccard_read_tuple and TUPLE_RETURN_COMMON cleanup
  pcmcia: properly close previous dev_printk if kzalloc fails in do_io_probe
  pcmcia: fix controller printk format warnings
parents 464d155c 94efb723

drivers/pcmcia/cistpl.c

+11 −9
Original line number Diff line number Diff line
@@ -1463,6 +1463,8 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t 
	    return -ENOMEM;

    }

    tuple.DesiredTuple = code;

    tuple.Attributes = 0;

    if (function == BIND_FN_ALL)

	    tuple.Attributes = TUPLE_RETURN_COMMON;

    ret = pccard_get_first_tuple(s, function, &tuple);

    if (ret != 0)
@@ -1490,7 +1492,7 @@ EXPORT_SYMBOL(pccard_read_tuple); 
    

======================================================================*/



int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned int *info)

int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info)

{

    tuple_t *tuple;

    cisparse_t *p;
@@ -1515,30 +1517,30 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned 
    count = reserved = 0;

    tuple->DesiredTuple = RETURN_FIRST_TUPLE;

    tuple->Attributes = TUPLE_RETURN_COMMON;

    ret = pccard_get_first_tuple(s, function, tuple);

    ret = pccard_get_first_tuple(s, BIND_FN_ALL, tuple);

    if (ret != 0)

	goto done;



    /* First tuple should be DEVICE; we should really have either that

       or a CFTABLE_ENTRY of some sort */

    if ((tuple->TupleCode == CISTPL_DEVICE) ||

	(pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY, p) == 0) ||

	(pccard_read_tuple(s, function, CISTPL_CFTABLE_ENTRY_CB, p) == 0))

	(pccard_read_tuple(s, BIND_FN_ALL, CISTPL_CFTABLE_ENTRY, p) == 0) ||

	(pccard_read_tuple(s, BIND_FN_ALL, CISTPL_CFTABLE_ENTRY_CB, p) == 0))

	dev_ok++;



    /* All cards should have a MANFID tuple, and/or a VERS_1 or VERS_2

       tuple, for card identification.  Certain old D-Link and Linksys

       cards have only a broken VERS_2 tuple; hence the bogus test. */

    if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == 0) ||

	(pccard_read_tuple(s, function, CISTPL_VERS_1, p) == 0) ||

	(pccard_read_tuple(s, function, CISTPL_VERS_2, p) != -ENOSPC))

    if ((pccard_read_tuple(s, BIND_FN_ALL, CISTPL_MANFID, p) == 0) ||

	(pccard_read_tuple(s, BIND_FN_ALL, CISTPL_VERS_1, p) == 0) ||

	(pccard_read_tuple(s, BIND_FN_ALL, CISTPL_VERS_2, p) != -ENOSPC))

	ident_ok++;



    if (!dev_ok && !ident_ok)

	goto done;



    for (count = 1; count < MAX_TUPLES; count++) {

	ret = pccard_get_next_tuple(s, function, tuple);

	ret = pccard_get_next_tuple(s, BIND_FN_ALL, tuple);

	if (ret != 0)

		break;

	if (((tuple->TupleCode > 0x23) && (tuple->TupleCode < 0x40)) ||

drivers/pcmcia/cs_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -197,8 +197,7 @@ int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, 
		      cisdata_t code, void *parse);

int pcmcia_replace_cis(struct pcmcia_socket *s,

		       const u8 *data, const size_t len);

int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function,

			unsigned int *count);

int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *count);



/* rsrc_mgr.c */

int pcmcia_validate_mem(struct pcmcia_socket *s);

drivers/pcmcia/ds.c

+4 −4
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev) 
	if (!vers1)

		return -ENOMEM;



	if (!pccard_read_tuple(p_dev->socket, p_dev->func,

	if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL,

			       CISTPL_MANFID, &manf_id)) {

		p_dev->manf_id = manf_id.manf;

		p_dev->card_id = manf_id.card;
@@ -581,9 +581,9 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev) 
		kfree(devgeo);

	}



	if (!pccard_read_tuple(p_dev->socket, p_dev->func, CISTPL_VERS_1,

	if (!pccard_read_tuple(p_dev->socket, BIND_FN_ALL, CISTPL_VERS_1,

			       vers1)) {

		for (i=0; i < vers1->ns; i++) {

		for (i = 0; i < min_t(unsigned int, 4, vers1->ns); i++) {

			char *tmp;

			unsigned int length;
@@ -733,7 +733,7 @@ static int pcmcia_card_add(struct pcmcia_socket *s) 
		return -EAGAIN; /* try again, but later... */

	}



	ret = pccard_validate_cis(s, BIND_FN_ALL, &no_chains);

	ret = pccard_validate_cis(s, &no_chains);

	if (ret || !no_chains) {

		ds_dev_dbg(0, &s->dev, "invalid CIS or invalid resources\n");

		return -ENODEV;

drivers/pcmcia/i82365.c

+2 −2
Original line number Diff line number Diff line
@@ -1053,8 +1053,8 @@ static int i365_set_io_map(u_short sock, struct pccard_io_map *io) 
    u_char map, ioctl;

    

    debug(1, "SetIOMap(%d, %d, %#2.2x, %d ns, "

	  "%#x-%#x)\n", sock, io->map, io->flags,

	  io->speed, io->start, io->stop);

	  "%#llx-%#llx)\n", sock, io->map, io->flags, io->speed,

	  (unsigned long long)io->start, (unsigned long long)io->stop);

    map = io->map;

    if ((map > 1) || (io->start > 0xffff) || (io->stop > 0xffff) ||

	(io->stop < io->start)) return -EINVAL;

drivers/pcmcia/m32r_cfc.c

+6 −4
Original line number Diff line number Diff line
@@ -537,8 +537,9 @@ static int _pcc_set_io_map(u_short sock, struct pccard_io_map *io) 
	u_char map;



	debug(3, "m32r_cfc: SetIOMap(%d, %d, %#2.2x, %d ns, "

		  "%#lx-%#lx)\n", sock, io->map, io->flags,

		  io->speed, io->start, io->stop);

		  "%#llx-%#llx)\n", sock, io->map, io->flags,

		  io->speed, (unsigned long long)io->start,

		  (unsigned long long)io->stop);

	map = io->map;



	return 0;
@@ -554,8 +555,9 @@ static int _pcc_set_mem_map(u_short sock, struct pccard_mem_map *mem) 
	pcc_socket_t *t = &socket[sock];



	debug(3, "m32r_cfc: SetMemMap(%d, %d, %#2.2x, %d ns, "

		 "%#lx, %#x)\n", sock, map, mem->flags,

		 mem->speed, mem->static_start, mem->card_start);

		 "%#llx, %#x)\n", sock, map, mem->flags,

		 mem->speed, (unsigned long long)mem->static_start,

		 mem->card_start);



	/*

	 * sanity check

CRA Git | Maintained and supported by SUSTech CRA and CCSE