[PATCH] sd.c major number off-by-one

Fix an off-by-one error in the simplified SD_MAJOR macro which not only
botches up the sd majors but also steals away the major used by my
favorite slow-than-dirt SCSI RAID controller: cpqarray. Please, can I
have it back?

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 9a7766fc9c6bcb82ed5d3b592e76820a1372c9d5..c43ab0c28946f2df97b13a8b303be96128bc50c9 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -58,7 +58,7 @@
  * Remaining dev_t-handling stuff
  */
 #define SD_MAJORS      8
-#define SD_MAJOR(i)    ((i) ? SCSI_DISK1_MAJOR+(i) : SCSI_DISK0_MAJOR)
+#define SD_MAJOR(i)    ((i) ? SCSI_DISK1_MAJOR-1+(i) : SCSI_DISK0_MAJOR)
 
 /*
  * Time out in seconds for disks and Magneto-opticals (which are slower).