Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
cdrom: update ioctl documentation
ide: note that IDE generic may prevent other drivers from attaching
ide-tape: fix vendor strings
Swarm: Fix crash due to missing initialization
+22
-7
+2
-2
Documentation/ioctl/cdrom.txt
+2
-2
Documentation/ioctl/cdrom.txt
···
271
271
272
272
usage:
273
273
274
-
ioctl(fd, CDROMEJECT, 0);
274
+
ioctl(fd, CDROMCLOSETRAY, 0);
275
275
276
276
inputs: none
277
277
278
278
outputs: none
279
279
280
280
error returns:
281
-
ENOSYS cd drive not capable of ejecting
281
+
ENOSYS cd drive not capable of closing the tray
282
282
EBUSY other processes are accessing drive, or door is locked
283
283
284
284
notes:
+14
drivers/ide/Kconfig
+14
drivers/ide/Kconfig
···
292
292
tristate "generic/default IDE chipset support"
293
293
depends on ALPHA || X86 || IA64 || M32R || MIPS
294
294
help
295
+
This is the generic IDE driver. This driver attaches to the
296
+
fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
297
+
so on). Please note that if this driver is built into the
298
+
kernel or loaded before other ATA (IDE or libata) drivers
299
+
and the controller is located at legacy ports, this driver
300
+
may grab those ports and thus can prevent the controller
301
+
specific driver from attaching.
302
+
303
+
Also, currently, IDE generic doesn't allow IRQ sharing
304
+
meaning that the IRQs it grabs won't be available to other
305
+
controllers sharing those IRQs which usually makes drivers
306
+
for those controllers fail. Generally, it's not a good idea
307
+
to load IDE generic driver on modern systems.
308
+
295
309
If unsure, say N.
296
310
297
311
config BLK_DEV_PLATFORM
+5
-5
drivers/ide/ide-tape.c
+5
-5
drivers/ide/ide-tape.c
···
2338
2338
{
2339
2339
idetape_tape_t *tape = drive->driver_data;
2340
2340
struct ide_atapi_pc pc;
2341
-
char fw_rev[6], vendor_id[10], product_id[18];
2341
+
char fw_rev[4], vendor_id[8], product_id[16];
2342
2342
2343
2343
idetape_create_inquiry_cmd(&pc);
2344
2344
if (idetape_queue_pc_tail(drive, &pc)) {
···
2350
2350
memcpy(product_id, &pc.buf[16], 16);
2351
2351
memcpy(fw_rev, &pc.buf[32], 4);
2352
2352
2353
-
ide_fixstring(vendor_id, 10, 0);
2354
-
ide_fixstring(product_id, 18, 0);
2355
-
ide_fixstring(fw_rev, 6, 0);
2353
+
ide_fixstring(vendor_id, 8, 0);
2354
+
ide_fixstring(product_id, 16, 0);
2355
+
ide_fixstring(fw_rev, 4, 0);
2356
2356
2357
-
printk(KERN_INFO "ide-tape: %s <-> %s: %s %s rev %s\n",
2357
+
printk(KERN_INFO "ide-tape: %s <-> %s: %.8s %.16s rev %.4s\n",
2358
2358
drive->name, tape->name, vendor_id, product_id, fw_rev);
2359
2359
}
2360
2360