---

yaml --- r: 324958 b: refs/heads/master c: c1db9a3 h: refs/heads/master v: v3
git-mirror · Sep 8, 2012 · 0b02381 · 0b02381
1 parent 289b5c3
commit 0b02381
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b08bfa38c06e0edbf6f434f6db3943e82d32239f
+refs/heads/master: c1db9a3090c8418088a9e12454144299359884f5
diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c
@@ -338,11 +338,6 @@ static int init_board_info(struct comedi_device *dev, struct pci_dev *pci_dev_p)
 	/* spin_lock_init(&info->preload_lock); */
 	/* spin_lock_init(&info->ai_ctrl_lock); */
 
-	/* Get the serial number */
-	result = pci_read_config_dword(pci_dev_p, 0x2C, &info->serial_no);
-	if (result != PCIBIOS_SUCCESSFUL)
-		return result;
-
 	/* Get the hardware revision */
 	result = pci_read_config_byte(pci_dev_p, 0x08, &info->hw_revision);
 	if (result != PCIBIOS_SUCCESSFUL)

diff --git a/trunk/drivers/staging/comedi/drivers/me4000.h b/trunk/drivers/staging/comedi/drivers/me4000.h
@@ -252,7 +252,6 @@ struct me4000_info {
 	unsigned long timer_regbase;	/*  Base address of the timer circuit */
 	unsigned long program_regbase;	/*  Base address to set the program pin for the xilinx */
 
-	unsigned int serial_no;	/*  Serial number of the board */
 	unsigned char hw_revision;	/*  Hardware revision of the board */
 	unsigned short vendor_id;	/*  Meilhaus vendor id */
 	unsigned short device_id;	/*  Device id */