Skip to contentSkip to conversation

usbserial not working/oops on removal

DISCUSSION Kevin Fenzi 3 participants 11 messages Mar 3, 2007

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

I'm seeing some oddity with the latest fedora development kernel and a usbserial device.

2.6.20-1.2949.fc7 #1 SMP Mon Feb 26 18:33:03 EST 2007 x86_64 x86_64 x86_64 GNU/Linux

Its a evdo device.

Doing:

modprobe usbserial vendor=0x413c product=0x8128 debug=1

gets:

drivers/usb/serial/usb-serial.c: Had to override the open usb serial operation with the generic one. drivers/usb/serial/usb-serial.c: Had to override the write usb serial operation with the generic one. drivers/usb/serial/usb-serial.c: Had to override the close usb serial operation with the generic one. drivers/usb/serial/usb-serial.c: Had to override the write_room usb serial operation with the generic one. drivers/usb/serial/usb-serial.c: Had to override the chars_in_buffer usb serial operation with the generic one. drivers/usb/serial/usb-serial.c: Had to override the read_bulk_callback usb serial operation with the generic one. drivers/usb/serial/usb-serial.c: Had to override the write_bulk_callback usb serial operation with the generic one. drivers/usb/serial/usb-serial.c: USB Serial support registered for generic drivers/usb/serial/usb-serial.c: static descriptor matches
drivers/usb/serial/usb-serial.c: found interrupt in on endpoint 0
drivers/usb/serial/usb-serial.c: found bulk in on endpoint 1
drivers/usb/serial/usb-serial.c: found bulk out on endpoint 2
usbserial_generic 1-2.2:1.0: generic converter detected
drivers/usb/serial/usb-serial.c: usb_serial_probe - setting up 1 port structures for this device drivers/usb/serial/usb-serial.c: the device claims to support interrupt in transfers, but read_int_callback is not defined drivers/usb/serial/usb-serial.c: get_free_serial 1
drivers/usb/serial/usb-serial.c: get_free_serial - minor base = 0
drivers/usb/serial/usb-serial.c: usb_serial_probe - registering ttyUSB255
Attempt to register invalid tty line number (255).
usb 1-2.2: generic converter now attached to ttyUSB255
drivers/usb/serial/usb-serial.c: static descriptor matches
drivers/usb/serial/usb-serial.c: found bulk in on endpoint 0
drivers/usb/serial/usb-serial.c: found bulk out on endpoint 1
usbserial_generic 1-2.2:1.1: generic converter detected
drivers/usb/serial/usb-serial.c: usb_serial_probe - setting up 1 port structures for this device drivers/usb/serial/usb-serial.c: get_free_serial 1
drivers/usb/serial/usb-serial.c: get_free_serial - minor base = 1
drivers/usb/serial/usb-serial.c: usb_serial_probe - registering ttyUSB255
usb-serial ttyUSB255: Error registering port device, continuing
usbcore: registered new interface driver usbserial_generic
drivers/usb/serial/usb-serial.c: USB Serial Driver core
usbcore: deregistering interface driver usbserial_generic
drivers/usb/serial/usb-serial.c: usb_serial_disconnect
drivers/usb/serial/usb-serial.c: destroy_serial - generic
drivers/usb/serial/generic.c: usb_serial_generic_shutdown
drivers/usb/serial/generic.c: generic_cleanup - port 255
drivers/usb/serial/usb-serial.c: return_serial

On a updated fc6 kernel it works fine and gives me a ttyUSB0, ttyUSB1. Trying to rmmod the module gets:

Unable to handle kernel NULL pointer dereference at 0000000000000048 RIP: 
 [<ffffffff80466693>] klist_del+0x16/0x50
PGD 626f0067 PUD 601bc067 PMD 0 
Oops: 0000 [1] SMP 
last sysfs file: /class/net/eth0/carrier
CPU 1 
Modules linked in: usbserial kvm_intel kvm i915 drm autofs4 hidp rfcomm l2cap sunrpc nf_conntrack_netbios_ns ipt_REJECT nf_conntrack_ipv4 xt_state nf_conntrack nfnetlink xt_tcpudp iptable_filter ip_tables x_tables acpi_cpufreq dm_multipath video sbs i2c_ec button bay dock battery asus_acpi ac ipv6 parport_pc lp parport aes cbc blkcipher sha256 dm_crypt snd_hda_intel snd_hda_codec snd_seq_dummy hci_usb bluetooth snd_seq_oss snd_seq_midi_event rtc_cmos fw_ohci snd_seq tg3 rtc_core fw_core serio_raw snd_seq_device rtc_lib snd_pcm_oss iTCO_wdt iTCO_vendor_support snd_mixer_oss snd_pcm snd_timer snd soundcore shpchp i2c_i801 snd_page_alloc i2c_core sr_mod cdrom sg joydev dm_snapshot dm_zero dm_mirror dm_mod ata_piix ata_generic libata sd_mod scsi_mod ext3 jbd mbcache ehci_hcd ohci_hcd uhci_hcd
Pid: 3256, comm: rmmod Not tainted 2.6.20-1.2949.fc7 #1
RIP: 0010:[<ffffffff80466693>]  [<ffffffff80466693>] klist_del+0x16/0x50
RSP: 0018:ffff8100606d1c88  EFLAGS: 00010296
RAX: ffff8100760cf2b8 RBX: 0000000000000000 RCX: 0000000000000001
RDX: ffff81004f4c6778 RSI: 0000000000000001 RDI: 0000000000000000
RBP: ffff8100606d1ca8 R08: 000000000000022a R09: 0000000000000001
R10: ffffffff884479d2 R11: 0000003000000018 R12: ffff8100760cf4a8
R13: ffff81004f4c6768 R14: ffff81007e386710 R15: ffff81007e386710
FS:  00002aaaab0136f0(0000) GS:ffff810003f5fcc0(0000) knlGS:0000000000000000
CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
CR2: 0000000000000048 CR3: 000000005e918000 CR4: 00000000000026e0
Process rmmod (pid: 3256, threadinfo ffff8100606d0000, task ffff810065365080)
Stack:  0000000000000001 ffff8100760cf458 ffff8100760cf458 ffff81004f4c6768
 ffff8100606d1cd8 ffffffff803b7d60 ffff8100760cf458 ffff81004f4c6768
 ffff81004f4c6768 0000000000000000 ffff8100606d1cf8 ffffffff803b7f6f
Call Trace:
 [<ffffffff803b7d60>] device_del+0x23/0x221
 [<ffffffff803b7f6f>] device_unregister+0x11/0x1e
 [<ffffffff88447d83>] :usbserial:destroy_serial+0x9a/0xf7
 [<ffffffff88447ce9>] :usbserial:destroy_serial+0x0/0xf7
 [<ffffffff80235ce2>] kref_put+0x71/0x7d
 [<ffffffff88447b4a>] :usbserial:usb_serial_put+0x14/0x16
 [<ffffffff88447be1>] :usbserial:usb_serial_disconnect+0x95/0xc1
 [<ffffffff803d3dc2>] usb_unbind_interface+0x47/0x87
 [<ffffffff803ba2a3>] __device_release_driver+0x93/0xb3
 [<ffffffff803ba8a4>] driver_detach+0xdb/0x11d
 [<ffffffff803b9dc1>] bus_remove_driver+0x75/0x98
 [<ffffffff803ba921>] driver_unregister+0x15/0x21
 [<ffffffff803d3746>] usb_deregister+0x9a/0xa8
 [<ffffffff884499c3>] :usbserial:usb_serial_generic_deregister+0x10/0x1e
 [<ffffffff8844a2dd>] :usbserial:usb_serial_exit+0x9/0x3b
 [<ffffffff802aa22d>] delete_module+0x15a/0x188
 [<ffffffff802aa2af>] sys_delete_module+0x54/0x65
 [<ffffffff802636ff>] trace_hardirqs_on_thunk+0x35/0x37
 [<ffffffff80222902>] __up_read+0x1a/0x83
 [<ffffffff8025c11e>] system_call+0x7e/0x83


Code: 4c 8b 6b 48 e8 ac d5 df ff 4c 89 e7 e8 39 ff ff ff 85 c0 74 
RIP  [<ffffffff80466693>] klist_del+0x16/0x50
 RSP <ffff8100606d1c88>

CR2: 0000000000000048

lsusb -v on the device:

Bus 001 Device 005: ID 413c:8128 Dell Computer Corp. Device Descriptor:
bLength 18
bDescriptorType 1
bcdUSB 1.10

  bDeviceClass            0 (Defined at Interface level)
  bDeviceSubClass         0 
  bDeviceProtocol         0 
  bMaxPacketSize0        64
  idVendor           0x413c Dell Computer Corp.
  idProduct          0x8128 
  bcdDevice            0.00
  iManufacturer           1 Novatel Wireless Inc.
  iProduct                2 Novatel Wireless EXPD CDMA
  iSerial                 0 
  bNumConfigurations      1

Configuration Descriptor:
bLength 9
bDescriptorType 2
wTotalLength 62
bNumInterfaces 2
bConfigurationValue 1
iConfiguration 0
bmAttributes 0xa0
Remote Wakeup
MaxPower 100mA
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 0
bAlternateSetting 0
bNumEndpoints 3
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 3 Data Interface
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x81 EP 1 IN
bmAttributes 3
Transfer Type Interrupt
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 128
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x82 EP 2 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x02 EP 2 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Interface Descriptor:
bLength 9
bDescriptorType 4
bInterfaceNumber 1
bAlternateSetting 0
bNumEndpoints 2
bInterfaceClass 255 Vendor Specific Class
bInterfaceSubClass 255 Vendor Specific Subclass
bInterfaceProtocol 255 Vendor Specific Protocol
iInterface 3 Data Interface
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x84 EP 4 IN
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0
Endpoint Descriptor:
bLength 7
bDescriptorType 5
bEndpointAddress 0x04 EP 4 OUT
bmAttributes 2
Transfer Type Bulk
Synch Type None
Usage Type Data
wMaxPacketSize 0x0040 1x 64 bytes
bInterval 0

Happy to provide more info, or file a bug in the fedora bugzilla if it looks like thats a good idea.

kevin

#1 lore raw

Am Samstag, 3. März 2007 03:37 schrieb Kevin Fenzi:

Quoted 2 lines

I'm seeing some oddity with the latest fedora development kernel and a usbserial device.

Very interesting. Is this repeatable? Does unplugging have the same effect?

Regards
Oliver

#2 lore raw
Quoted 5 lines · On Sat, 3 Mar 2007 07:45:19 +0100 [email protected] (Oliver Neukum) wrote:

Am Samstag, 3. März 2007 03:37 schrieb Kevin Fenzi:

Quoted 2 lines

I'm seeing some oddity with the latest fedora development kernel and a usbserial device.

Very interesting. Is this repeatable?

Yep. Tried a half dozen times or so... same thing each time.

Quoted 2 lines

Does unplugging have the same
effect?

Well, the card is a minipci, so I would prefer to avoid taking the machine apart to unplug the card. ;)

Quoted 2 lines

Regards
Oliver

kevin

#3 lore raw
In reply to Oliver Neukum

Am Samstag, den 03.03.2007, 07:45 +0100 schrieb Oliver Neukum:

Quoted 5 lines

Am Samstag, 3. März 2007 03:37 schrieb Kevin Fenzi:

Quoted 2 lines

I'm seeing some oddity with the latest fedora development kernel and a usbserial device.

Very interesting. Is this repeatable? Does unplugging have the same effect?

I see it also on fedora rawhide using reinersct (cyberjack) scard readers and it repeatable.
The first usbserial devices likes to register the line number 255 which indeed is invalid.

2.6.20-1.2953.fc7:

usbcore: registered new interface driver usbserial
drivers/usb/serial/usb-serial.c: USB Serial support registered for generic
parport0: Printer, Hewlett-Packard HP LaserJet 6L
usbcore: registered new interface driver usbserial_generic drivers/usb/serial/usb-serial.c: USB Serial Driver core drivers/usb/serial/usb-serial.c: USB Serial support registered for Reiner SCT Cyberjack USB card reader cyberjack 5-2.2:1.0: Reiner SCT Cyberjack USB card reader converter detected
Attempt to register invalid tty line number (255).
usb 5-2.2: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB255 cyberjack 5-2.3:1.0: Reiner SCT Cyberjack USB card reader converter detected usb-serial ttyUSB255: Error registering port device, continuing
usbcore: registered new interface driver cyberjack
drivers/usb/serial/cyberjack.c: v1.01 Matthias Bruestle drivers/usb/serial/cyberjack.c: REINER SCT cyberJack pinpad/e-com USB Chipcard Reader Driver

Last rawhide kernel which was working for me is
kernel-2.6.20-1.2925.fc7.x86_64

2.6.20-1.2925.fc7:

usbcore: registered new interface driver usbserial
drivers/usb/serial/usb-serial.c: USB Serial support registered for generic
usbcore: registered new interface driver usbserial_generic drivers/usb/serial/usb-serial.c: USB Serial Driver core
input: PC Speaker as /class/input/input2
ata_piix 0000:00:1f.1: version 2.00ac7
ACPI: PCI Interrupt 0000:00:1f.1[A] -> GSI 16 (level, low) -> IRQ 16
PCI: Setting latency timer of device 0000:00:1f.1 to 64
ata7: PATA max UDMA/100 cmd 0x1F0 ctl 0x3F6 bmdma 0xFFA0 irq 14
ata8: PATA max UDMA/100 cmd 0x170 ctl 0x376 bmdma 0xFFA8 irq 15
scsi6 : ata_piix
drivers/usb/serial/usb-serial.c: USB Serial support registered for Reiner SCT Cyberjack USB card reader cyberjack 4-1:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 4-1: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB0 cyberjack 4-2:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 4-2: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB1 cyberjack 5-4.1.2:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-4.1.2: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB2 cyberjack 5-4.1.3:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-4.1.3: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB3 cyberjack 5-2.3:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.3: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB4 cyberjack 5-2.1:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.1: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB5 cyberjack 5-2.2:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.2: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB6
usbcore: registered new interface driver cyberjack
drivers/usb/serial/cyberjack.c: v1.01 Matthias Bruestle drivers/usb/serial/cyberjack.c: REINER SCT cyberJack pinpad/e-com USB Chipcard Reader Driver

System is x86_64 XEON 5160 4GB RAM

Regards
Andreas

Quoted 8 lines

Regards
Oliver
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#4 lore raw

Am Samstag, 3. März 2007 08:19 schrieb Andreas Laumann:

Quoted 11 lines

Am Samstag, den 03.03.2007, 07:45 +0100 schrieb Oliver Neukum:

Quoted 5 lines

Am Samstag, 3. März 2007 03:37 schrieb Kevin Fenzi:

Quoted 2 lines

I'm seeing some oddity with the latest fedora development kernel and a usbserial device.

Very interesting. Is this repeatable? Does unplugging have the same effect?

I see it also on fedora rawhide using reinersct (cyberjack) scard readers and it repeatable.
The first usbserial devices likes to register the line number 255 which indeed is invalid.

OK, please try this patch.

Regards
Oliver

drivers/usb/serial/usb-serial.c renamed from drivers/usb/serial/usb-serial.c.alt +1 -1
@@ -826,7 +826,6 @@
 			num_ports = type->num_ports;
 	}
 
-	serial->minor = minor;
 	serial->num_ports = num_ports;
 	serial->num_bulk_in = num_bulk_in;
 	serial->num_bulk_out = num_bulk_out;
@@ -980,6 +979,7 @@
 		dev_err(&interface->dev, "No more free serial devices\n");
 		goto probe_error;
 	}
+	serial->minor = minor;
 
 	/* register all of the individual ports with the driver core */
 	for (i = 0; i < num_ports; ++i) {
#5 lore raw

Am Samstag, den 03.03.2007, 11:38 +0100 schrieb Oliver Neukum:

Quoted 29 lines

Am Samstag, 3. März 2007 08:19 schrieb Andreas Laumann:

Quoted 11 lines

Am Samstag, den 03.03.2007, 07:45 +0100 schrieb Oliver Neukum:

Quoted 5 lines

Am Samstag, 3. März 2007 03:37 schrieb Kevin Fenzi:

Quoted 2 lines

I'm seeing some oddity with the latest fedora development kernel and a usbserial device.

Very interesting. Is this repeatable? Does unplugging have the same effect?

I see it also on fedora rawhide using reinersct (cyberjack) scard readers and it repeatable.
The first usbserial devices likes to register the line number 255 which indeed is invalid.

OK, please try this patch.

Regards
Oliver

drivers/usb/serial/usb-serial.c renamed from drivers/usb/serial/usb-serial.c.alt +0 -1
@@ -826,7 +826,6 @@
 			num_ports = type->num_ports;
 	}
 
-	serial->minor = minor;
 	serial->num_ports = num_ports;
 	serial->num_bulk_in = num_bulk_in;
 	serial->num_bulk_out = num_bulk_out;

drivers/usb/serial/usb-serial.c line 985

Quoted 7 lines
drivers/usb/serial/usb-serial.c renamed from drivers/usb/serial/usb-serial.c.alt +1 -0
@@ -980,6 +979,7 @@
 		dev_err(&interface->dev, "No more free serial devices\n");
 		goto probe_error;
 	}
+	serial->minor = minor;
 
 	/* register all of the individual ports with the driver core */
 	for (i = 0; i < num_ports; ++i) {

Unfortunately your fix does not work. The first one seems registered correctly, but after that it fails again for the next one.

usbcore: registered new interface driver usbserial
drivers/usb/serial/usb-serial.c: USB Serial support registered for generic
usbcore: registered new interface driver usbserial_generic drivers/usb/serial/usb-serial.c: USB Serial Driver core drivers/usb/serial/usb-serial.c: USB Serial support registered for Reiner SCT Cyberjack USB card reader cyberjack 5-2.2:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.2: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB0 cyberjack 5-2.3:1.0: Reiner SCT Cyberjack USB card reader converter detected usb-serial ttyUSB0: Error registering port device, continuing
usbcore: registered new interface driver cyberjack
drivers/usb/serial/cyberjack.c: v1.01 Matthias Bruestle drivers/usb/serial/cyberjack.c: REINER SCT cyberJack pinpad/e-com USB Chipcard Reader Driver

Andreas

#6 lore raw

Am Samstag, 3. März 2007 14:27 schrieb Andreas Laumann:

Quoted 2 lines

Unfortunately your fix  does not work.  The first one seems registered correctly, but after that it fails again for the next one.

Please try this additional patch on top of the first.

Regards
Oliver

drivers/usb/serial/usb-serial.c +3 -1
@@ -847,7 +847,6 @@
 		port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
 		if (!port)
 			goto probe_error;
-		port->number = i + serial->minor;
 		port->serial = serial;
 		spin_lock_init(&port->lock);
 		mutex_init(&port->mutex);
@@ -982,6 +981,9 @@
 	}
 	serial->minor = minor;
 
+	for (i = 0; i < max_endpoints; ++i)
+		serial->port[i]->number = i + serial->minor;
+
 	/* register all of the individual ports with the driver core */
 	for (i = 0; i < num_ports; ++i) {
 		port = serial->port[i];
#7 lore raw

Am Samstag, den 03.03.2007, 16:33 +0100 schrieb Oliver Neukum:

Quoted 20 lines

Am Samstag, 3. März 2007 14:27 schrieb Andreas Laumann:

Quoted 2 lines

Unfortunately your fix does not work. The first one seems registered correctly, but after that it fails again for the next one.

Please try this additional patch on top of the first.

Regards
Oliver

drivers/usb/serial/usb-serial.c +0 -1
@@ -847,7 +847,6 @@
 		port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
 		if (!port)
 			goto probe_error;
-		port->number = i + serial->minor;
 		port->serial = serial;
 		spin_lock_init(&port->lock);
 		mutex_init(&port->mutex);

drivers/usb/serial/usb-serial.c line 989

Quoted 9 lines
drivers/usb/serial/usb-serial.c +3 -0
@@ -982,6 +981,9 @@
 	}
 	serial->minor = minor;
 
+	for (i = 0; i < max_endpoints; ++i)
+		serial->port[i]->number = i + serial->minor;
+
 	/* register all of the individual ports with the driver core */
 	for (i = 0; i < num_ports; ++i) {
 		port = serial->port[i];

Now, we're back in business. The combined patches are working with rawhide's
kernel-2.6.20-1.2962.fc7.x86_64 which in fact is 2.6.21rc2-git2

usbcore: registered new interface driver usbserial
drivers/usb/serial/usb-serial.c: USB Serial support registered for generic
usbcore: registered new interface driver usbserial_generic drivers/usb/serial/usb-serial.c: USB Serial Driver core drivers/usb/serial/usb-serial.c: USB Serial support registered for Reiner SCT Cyberjack USB card reader cyberjack 5-2.2:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.2: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB0 cyberjack 5-2.3:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.3: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB1
usbcore: registered new interface driver cyberjack
drivers/usb/serial/cyberjack.c: v1.01 Matthias Bruestle drivers/usb/serial/cyberjack.c: REINER SCT cyberJack pinpad/e-com USB Chipcard Reader Driver

Good job, Oliver.

Regards
Andreas

Signature · 2 lines
All that is necessary for the triumph of evil is that good men do
nothing. - Edmund Burke (1729 - 1797)
#8 lore raw
In reply to Andreas Laumann

Am Samstag, 3. März 2007 14:27 schrieb Andreas Laumann:

Quoted 2 lines

Unfortunately your fix  does not work.  The first one seems registered correctly, but after that it fails again for the next one.

Unfortunately the last patch I sent you introduced a race. Could you test this alternative patch?

Regards
Oliver

drivers/usb/serial/usb-serial.c +4 -2
@@ -99,9 +99,12 @@
 			continue;
 
 		*minor = i;
+		j = 0;
 		dbg("%s - minor base = %d", __FUNCTION__, *minor);
-		for (i = *minor; (i < (*minor + num_ports)) && (i < SERIAL_TTY_MINORS); ++i)
+		for (i = *minor; (i < (*minor + num_ports)) && (i < SERIAL_TTY_MINORS); ++i) {
 			serial_table[i] = serial;
+			serial->port[j++]->number = i;
+		}
 		spin_unlock(&table_lock);
 		return serial;
 	}
@@ -847,7 +850,6 @@
 		port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
 		if (!port)
 			goto probe_error;
-		port->number = i + serial->minor;
 		port->serial = serial;
 		spin_lock_init(&port->lock);
 		mutex_init(&port->mutex);
#9 lore raw

Am Samstag, den 03.03.2007, 21:43 +0100 schrieb Oliver Neukum:

Quoted 27 lines

Am Samstag, 3. März 2007 14:27 schrieb Andreas Laumann:

Quoted 2 lines

Unfortunately your fix does not work. The first one seems registered correctly, but after that it fails again for the next one.

Unfortunately the last patch I sent you introduced a race. Could you test this alternative patch?

Regards
Oliver

drivers/usb/serial/usb-serial.c +4 -1
@@ -99,9 +99,12 @@
 			continue;
 
 		*minor = i;
+		j = 0;
 		dbg("%s - minor base = %d", __FUNCTION__, *minor);
-		for (i = *minor; (i < (*minor + num_ports)) && (i < SERIAL_TTY_MINORS); ++i)
+		for (i = *minor; (i < (*minor + num_ports)) && (i < SERIAL_TTY_MINORS); ++i) {
 			serial_table[i] = serial;
+			serial->port[j++]->number = i;
+		}
 		spin_unlock(&table_lock);
 		return serial;
 	}

drivers/usb/serial/usb-serial.c line 855

Quoted 7 lines
drivers/usb/serial/usb-serial.c +0 -1
@@ -847,7 +850,6 @@
 		port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
 		if (!port)
 			goto probe_error;
-		port->number = i + serial->minor;
 		port->serial = serial;
 		spin_lock_init(&port->lock);
 		mutex_init(&port->mutex);

On top of the first patch ? Sure, I'll try it in a couple of minutes

Btw, I got rejects from the last patch (the racy one) you've sent and had to apply them manually. Which version do you use ?

Regards
Andreas

#10 lore raw
In reply to Oliver Neukum

Am Samstag, den 03.03.2007, 21:43 +0100 schrieb Oliver Neukum:

Quoted 27 lines

Am Samstag, 3. März 2007 14:27 schrieb Andreas Laumann:

Quoted 2 lines

Unfortunately your fix does not work. The first one seems registered correctly, but after that it fails again for the next one.

Unfortunately the last patch I sent you introduced a race. Could you test this alternative patch?

Regards
Oliver

drivers/usb/serial/usb-serial.c +4 -1
@@ -99,9 +99,12 @@
 			continue;
 
 		*minor = i;
+		j = 0;
 		dbg("%s - minor base = %d", __FUNCTION__, *minor);
-		for (i = *minor; (i < (*minor + num_ports)) && (i < SERIAL_TTY_MINORS); ++i)
+		for (i = *minor; (i < (*minor + num_ports)) && (i < SERIAL_TTY_MINORS); ++i) {
 			serial_table[i] = serial;
+			serial->port[j++]->number = i;
+		}
 		spin_unlock(&table_lock);
 		return serial;
 	}

drivers/usb/serial/usb-serial.c line 855

Quoted 7 lines
drivers/usb/serial/usb-serial.c +0 -1
@@ -847,7 +850,6 @@
 		port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL);
 		if (!port)
 			goto probe_error;
-		port->number = i + serial->minor;
 		port->serial = serial;
 		spin_lock_init(&port->lock);
 		mutex_init(&port->mutex);

Yep, this patch works also.

cyberjack 5-2.2:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.2: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB0
cyberjack 5-2.3:1.0: Reiner SCT Cyberjack USB card reader converter detected
usb 5-2.3: Reiner SCT Cyberjack USB card reader converter now attached to ttyUSB1

Regards
Andreas