diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-03-28 20:41:33 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-03-28 20:41:33 +0000 |
| commit | 3f4d4f4e46865cb01d2e2717c6906e2ae079c042 (patch) | |
| tree | 4f57f0b4269afbb0a80966a2bce9154062e6427a /drivers | |
| parent | 4dfff8c160e1cb2f64b50a86211204395d00a0dd (diff) | |
Miscellaneous build/bug fixes.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/icside.c | 2 | ||||
| -rw-r--r-- | drivers/video/cyber2000fb.c | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c index 70cb1be2bf71..598cb6c98d88 100644 --- a/drivers/ide/icside.c +++ b/drivers/ide/icside.c @@ -441,7 +441,7 @@ icside_dmaproc(ide_dma_action_t func, ide_drive_t *drive) : DMA_MODE_WRITE); drive->waiting_for_dma = 1; - if (drive->media != ide_disk) + if (drive->type != ATA_DISK) return 0; ide_set_handler(drive, &icside_dmaintr, WAIT_CMD, NULL); diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index 9df1427fc7c7..887072a50216 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c @@ -1402,6 +1402,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name) cfb->fb.updatevar = cyber2000fb_updatevar; cfb->fb.blank = cyber2000fb_blank; cfb->fb.flags = FBINFO_FLAG_DEFAULT; + cfb->fb.node = NODEV; cfb->fb.disp = (struct display *)(cfb + 1); cfb->fb.pseudo_palette = (void *)(cfb->fb.disp + 1); @@ -1819,7 +1820,7 @@ static struct pci_driver cyberpro_driver = { */ int __init cyber2000fb_init(void) { - int ret = -1, err = 0; + int ret = -1, err = -ENODEV; #ifdef CONFIG_ARCH_SHARK err = cyberpro_vl_probe(); if (!err) { @@ -1827,19 +1828,16 @@ int __init cyber2000fb_init(void) MOD_INC_USE_COUNT; } #endif -#ifdef CONFIG_PCI err = pci_module_init(&cyberpro_driver); if (!err) ret = err; -#endif + return ret ? err : 0; } static void __exit cyberpro_exit(void) { -#ifdef CONFIG_PCI pci_unregister_driver(&cyberpro_driver); -#endif } #ifdef MODULE |