* [PATCH] pcmcia: add CNF-CDROM-ID for ide/pata
@ 2009-07-26 16:27 Wolfram Sang
2009-07-29 1:10 ` Jeff Garzik
2009-08-06 13:16 ` Wolfram Sang
0 siblings, 2 replies; 8+ messages in thread
From: Wolfram Sang @ 2009-07-26 16:27 UTC (permalink / raw)
To: linux-ide; +Cc: linux-pcmcia, Wolfram Sang
Fixes this report:
http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/
Reported-by: John McGrath <john@john-mcgrath.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
drivers/ata/pata_pcmcia.c | 1 +
drivers/ide/ide-cs.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index f4d009e..dc99e26 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -411,6 +411,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728),
+ PCMCIA_DEVICE_PROD_ID12("CNF ", "CD-ROM", 0x46d7db81, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4),
PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 527908f..063b933 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -408,6 +408,7 @@ static struct pcmcia_device_id ide_ids[] = {
PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728),
+ PCMCIA_DEVICE_PROD_ID12("CNF ", "CD-ROM", 0x46d7db81, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4),
PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
--
1.6.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] pcmcia: add CNF-CDROM-ID for ide/pata
2009-07-26 16:27 [PATCH] pcmcia: add CNF-CDROM-ID for ide/pata Wolfram Sang
@ 2009-07-29 1:10 ` Jeff Garzik
2009-08-06 13:16 ` Wolfram Sang
1 sibling, 0 replies; 8+ messages in thread
From: Jeff Garzik @ 2009-07-29 1:10 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-ide, linux-pcmcia, David Miller
Wolfram Sang wrote:
> Fixes this report:
> http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/
>
> Reported-by: John McGrath <john@john-mcgrath.com>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
> drivers/ata/pata_pcmcia.c | 1 +
> drivers/ide/ide-cs.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
> index f4d009e..dc99e26 100644
> --- a/drivers/ata/pata_pcmcia.c
> +++ b/drivers/ata/pata_pcmcia.c
> @@ -411,6 +411,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
> PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
> PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728),
> + PCMCIA_DEVICE_PROD_ID12("CNF ", "CD-ROM", 0x46d7db81, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4),
> PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
applied the pata_pcmcia portion of this
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] pcmcia: add CNF-CDROM-ID for ide/pata
2009-07-26 16:27 [PATCH] pcmcia: add CNF-CDROM-ID for ide/pata Wolfram Sang
2009-07-29 1:10 ` Jeff Garzik
@ 2009-08-06 13:16 ` Wolfram Sang
2009-08-06 20:24 ` David Miller
1 sibling, 1 reply; 8+ messages in thread
From: Wolfram Sang @ 2009-08-06 13:16 UTC (permalink / raw)
To: linux-ide; +Cc: linux-pcmcia, jeff, David Miller
[-- Attachment #1: Type: text/plain, Size: 2582 bytes --]
Hello David,
as Jeff already picked up the pata part of this patch, I wondered how to
proceed with the ide-cs-part. Will you pick it up for .31 or .32 or should it
go via the pcmcia-tree (which will make its next pull-request for .32)?
Kind regards,
Wolfram
On Sun, Jul 26, 2009 at 06:27:29PM +0200, Wolfram Sang wrote:
> Fixes this report:
> http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/
>
> Reported-by: John McGrath <john@john-mcgrath.com>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
> drivers/ata/pata_pcmcia.c | 1 +
> drivers/ide/ide-cs.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
> index f4d009e..dc99e26 100644
> --- a/drivers/ata/pata_pcmcia.c
> +++ b/drivers/ata/pata_pcmcia.c
> @@ -411,6 +411,7 @@ static struct pcmcia_device_id pcmcia_devices[] = {
> PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
> PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728),
> + PCMCIA_DEVICE_PROD_ID12("CNF ", "CD-ROM", 0x46d7db81, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4),
> PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
> diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
> index 527908f..063b933 100644
> --- a/drivers/ide/ide-cs.c
> +++ b/drivers/ide/ide-cs.c
> @@ -408,6 +408,7 @@ static struct pcmcia_device_id ide_ids[] = {
> PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
> PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728),
> + PCMCIA_DEVICE_PROD_ID12("CNF ", "CD-ROM", 0x46d7db81, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591),
> PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4),
> PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
> --
> 1.6.3.1
>
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] pcmcia: add CNF-CDROM-ID for ide/pata
2009-08-06 13:16 ` Wolfram Sang
@ 2009-08-06 20:24 ` David Miller
2009-08-07 11:17 ` [PATCH] pcmcia: add CNF-CDROM-ID for ide Wolfram Sang
0 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2009-08-06 20:24 UTC (permalink / raw)
To: w.sang; +Cc: linux-ide, linux-pcmcia, jeff
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Thu, 6 Aug 2009 15:16:42 +0200
> as Jeff already picked up the pata part of this patch, I wondered how to
> proceed with the ide-cs-part. Will you pick it up for .31 or .32 or should it
> go via the pcmcia-tree (which will make its next pull-request for .32)?
Please just make a fresh submission of just the IDE part and I'll
apply it, thanks!
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] pcmcia: add CNF-CDROM-ID for ide
2009-08-06 20:24 ` David Miller
@ 2009-08-07 11:17 ` Wolfram Sang
2009-08-14 20:09 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: Wolfram Sang @ 2009-08-07 11:17 UTC (permalink / raw)
To: linux-ide; +Cc: linux-pcmcia, David Miller, Wolfram Sang
Fixes this report:
http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/
Reported-by: John McGrath <john@john-mcgrath.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
---
drivers/ide/ide-cs.c | 1 +
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 527908f..063b933 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -408,6 +408,7 @@ static struct pcmcia_device_id ide_ids[] = {
PCMCIA_DEVICE_PROD_ID123("PCMCIA", "IDE CARD", "F1", 0x281f1c5d, 0x1907960c, 0xf7fde8b9),
PCMCIA_DEVICE_PROD_ID12("ARGOSY", "CD-ROM", 0x78f308dc, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("ARGOSY", "PnPIDE", 0x78f308dc, 0x0c694728),
+ PCMCIA_DEVICE_PROD_ID12("CNF ", "CD-ROM", 0x46d7db81, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("CNF CD-M", "CD-ROM", 0x7d93b852, 0x66536591),
PCMCIA_DEVICE_PROD_ID12("Creative Technology Ltd.", "PCMCIA CD-ROM Interface Card", 0xff8c8a45, 0xfe8020c4),
PCMCIA_DEVICE_PROD_ID12("Digital Equipment Corporation.", "Digital Mobile Media CD-ROM", 0x17692a66, 0xef1dcbde),
--
1.6.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] pcmcia: add CNF-CDROM-ID for ide
2009-08-07 11:17 ` [PATCH] pcmcia: add CNF-CDROM-ID for ide Wolfram Sang
@ 2009-08-14 20:09 ` David Miller
2009-09-06 15:33 ` Wolfram Sang
0 siblings, 1 reply; 8+ messages in thread
From: David Miller @ 2009-08-14 20:09 UTC (permalink / raw)
To: w.sang; +Cc: linux-ide, linux-pcmcia
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Fri, 7 Aug 2009 13:17:50 +0200
> Fixes this report:
> http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/
>
> Reported-by: John McGrath <john@john-mcgrath.com>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Applied, thank you.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] pcmcia: add CNF-CDROM-ID for ide
2009-08-14 20:09 ` David Miller
@ 2009-09-06 15:33 ` Wolfram Sang
2009-09-06 20:59 ` David Miller
0 siblings, 1 reply; 8+ messages in thread
From: Wolfram Sang @ 2009-09-06 15:33 UTC (permalink / raw)
To: David Miller; +Cc: linux-ide, linux-pcmcia
[-- Attachment #1: Type: text/plain, Size: 726 bytes --]
On Fri, Aug 14, 2009 at 01:09:38PM -0700, David Miller wrote:
> From: Wolfram Sang <w.sang@pengutronix.de>
> Date: Fri, 7 Aug 2009 13:17:50 +0200
>
> > Fixes this report:
> > http://article.gmane.org/gmane.linux.kernel.pcmcia.devel/2228/
> >
> > Reported-by: John McGrath <john@john-mcgrath.com>
> > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
>
> Applied, thank you.
I just noticed that it is not in rc9. Is it possible to get it into .31?
Otherwise the ide and pata driver would diverge for this kernel version.
Rgeards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2009-09-06 20:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-26 16:27 [PATCH] pcmcia: add CNF-CDROM-ID for ide/pata Wolfram Sang
2009-07-29 1:10 ` Jeff Garzik
2009-08-06 13:16 ` Wolfram Sang
2009-08-06 20:24 ` David Miller
2009-08-07 11:17 ` [PATCH] pcmcia: add CNF-CDROM-ID for ide Wolfram Sang
2009-08-14 20:09 ` David Miller
2009-09-06 15:33 ` Wolfram Sang
2009-09-06 20:59 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).