diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 13:03:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 13:03:24 -0400 |
| commit | 8973a585aec125beb2a3de50bb491004299f53d5 (patch) | |
| tree | 3f069a9c7eff2c916e02427fd9800ce2b55a4a90 /drivers/pcmcia/ds.c | |
| parent | 907f4678c114a125fe4584758681c31bf3d627da (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'drivers/pcmcia/ds.c')
| -rw-r--r-- | drivers/pcmcia/ds.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 66150d08b5c7..c4ade288c5da 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -1592,9 +1592,9 @@ static int __init init_pcmcia_bus(void) | |||
| 1592 | 1592 | ||
| 1593 | /* Set up character device for user mode clients */ | 1593 | /* Set up character device for user mode clients */ |
| 1594 | i = register_chrdev(0, "pcmcia", &ds_fops); | 1594 | i = register_chrdev(0, "pcmcia", &ds_fops); |
| 1595 | if (i == -EBUSY) | 1595 | if (i < 0) |
| 1596 | printk(KERN_NOTICE "unable to find a free device # for " | 1596 | printk(KERN_NOTICE "unable to find a free device # for " |
| 1597 | "Driver Services\n"); | 1597 | "Driver Services (error=%d)\n", i); |
| 1598 | else | 1598 | else |
| 1599 | major_dev = i; | 1599 | major_dev = i; |
| 1600 | 1600 | ||