public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Russell King <rmk@arm.linux.org.uk>
To: Dominik Brodowski <linux@brodo.de>
Cc: torvalds@transmeta.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] pcmcia: add socket_offset for multiple pci_sockets, correct suspend&resume
Date: Sun, 23 Feb 2003 12:00:11 +0000	[thread overview]
Message-ID: <20030223120011.A14488@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20030223090608.GA11747@brodo.de>; from linux@brodo.de on Sun, Feb 23, 2003 at 10:06:08AM +0100

On Sun, Feb 23, 2003 at 10:06:08AM +0100, Dominik Brodowski wrote:
> diff -ruN linux-original/drivers/pcmcia/cs.c linux/drivers/pcmcia/cs.c
> --- linux-original/drivers/pcmcia/cs.c	2003-02-23 10:04:03.000000000 +0100
> +++ linux/drivers/pcmcia/cs.c	2003-02-23 10:04:25.000000000 +0100
> @@ -337,13 +337,14 @@
>  		return -ENOMEM;
>  	memset(s_info, 0, cls_d->nsock * sizeof(socket_info_t));
>  
> +	cls_d->s_info = s_info;
> +
>  	/* socket initialization */
>  	for (i = 0; i < cls_d->nsock; i++) {
>  		socket_info_t *s = &s_info[i];
>  
> -		cls_d->s_info[i] = s;
>  		s->ss_entry = cls_d->ops;
> -		s->sock = i;
> +		s->sock = i + cls_d->sock_offset;
>  
>  		/* base address = 0, map = 0 */
>  		s->cis_mem.flags = 0;

I think you missed changing:

                s->ss_entry->inquire_socket(i, &s->cap);

to:

                s->ss_entry->inquire_socket(s->sock, &s->cap);

otherwise both sockets end up pointing at the same cb_dev.

-- 
Russell King (rmk@arm.linux.org.uk)                The developer of ARM Linux
             http://www.arm.linux.org.uk/personal/aboutme.html

  reply	other threads:[~2003-02-23 11:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-02-23  9:06 [PATCH] pcmcia: add socket_offset for multiple pci_sockets, correct suspend&resume Dominik Brodowski
2003-02-23 12:00 ` Russell King [this message]
2003-02-23 12:15   ` [UPDATED PATCH] " Dominik Brodowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20030223120011.A14488@flint.arm.linux.org.uk \
    --to=rmk@arm.linux.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@brodo.de \
    --cc=torvalds@transmeta.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox