Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/ide/ide-io.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index ca741c21e4aa..f177c2d4017f 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -570,7 +570,7 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
         struct device_node *node = vdev->dev.archdata.of_node;
 
         deviceno = vdev->unit_address;
-        if (deviceno > VIOCD_MAX_CD)
+        if (deviceno >= VIOCD_MAX_CD)
                 return -ENODEV;
         if (!node)
                 return -ENODEV;