qlge: bugfix: Move netif_napi_del() to common call point.

[safe/jmp/linux-2.6] / drivers / scsi / sr_vendor.c

diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c
index 4eb3da9..4ad3e01 100644 (file)
--- a/drivers/scsi/sr_vendor.c
+++ b/drivers/scsi/sr_vendor.c
@@ -223,9 +223,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
                                no_multi = 1;
                                break;
                        }
-                       min = BCD2BIN(buffer[15]);
-                       sec = BCD2BIN(buffer[16]);
-                       frame = BCD2BIN(buffer[17]);
+                       min = bcd2bin(buffer[15]);
+                       sec = bcd2bin(buffer[16]);
+                       frame = bcd2bin(buffer[17]);
                        sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
                        break;
                }
@@ -252,9 +252,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
                        }
                        if (rc != 0)
                                break;
-                       min = BCD2BIN(buffer[1]);
-                       sec = BCD2BIN(buffer[2]);
-                       frame = BCD2BIN(buffer[3]);
+                       min = bcd2bin(buffer[1]);
+                       sec = bcd2bin(buffer[2]);
+                       frame = bcd2bin(buffer[3]);
                        sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
                        if (sector)
                                sector -= CD_MSF_OFFSET;