aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c2
-rw-r--r--drivers/media/video/zoran/zoran_driver.c2
-rw-r--r--drivers/s390/block/dasd_eckd.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index ec73d9f6d9ed..273be76be988 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1667,7 +1667,7 @@ static int cmm_open(struct inode *inode, struct file *filp)
1667 /* opening will always block since the 1667 /* opening will always block since the
1668 * monitor will be started by open, which 1668 * monitor will be started by open, which
1669 * means we have to wait for ATR becoming 1669 * means we have to wait for ATR becoming
1670 * vaild = block until valid (or card 1670 * valid = block until valid (or card
1671 * inserted) 1671 * inserted)
1672 */ 1672 */
1673 if (filp->f_flags & O_NONBLOCK) { 1673 if (filp->f_flags & O_NONBLOCK) {
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 6f89d0a096ea..3c471a4e3e4a 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1177,7 +1177,7 @@ static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height
1177 if (height > BUZ_MAX_HEIGHT) 1177 if (height > BUZ_MAX_HEIGHT)
1178 height = BUZ_MAX_HEIGHT; 1178 height = BUZ_MAX_HEIGHT;
1179 1179
1180 /* Check for vaild parameters */ 1180 /* Check for invalid parameters */
1181 if (width < BUZ_MIN_WIDTH || height < BUZ_MIN_HEIGHT || 1181 if (width < BUZ_MIN_WIDTH || height < BUZ_MIN_HEIGHT ||
1182 width > BUZ_MAX_WIDTH || height > BUZ_MAX_HEIGHT) { 1182 width > BUZ_MAX_WIDTH || height > BUZ_MAX_HEIGHT) {
1183 dprintk(1, 1183 dprintk(1,
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 66360c24bd48..59b4ecfb967b 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -1190,7 +1190,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
1190 goto out_err2; 1190 goto out_err2;
1191 } 1191 }
1192 /* 1192 /*
1193 * dasd_eckd_vaildate_server is done on the first device that 1193 * dasd_eckd_validate_server is done on the first device that
1194 * is found for an LCU. All later other devices have to wait 1194 * is found for an LCU. All later other devices have to wait
1195 * for it, so they will read the correct feature codes. 1195 * for it, so they will read the correct feature codes.
1196 */ 1196 */
@@ -1216,7 +1216,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
1216 "Read device characteristic failed, rc=%d", rc); 1216 "Read device characteristic failed, rc=%d", rc);
1217 goto out_err3; 1217 goto out_err3;
1218 } 1218 }
1219 /* find the vaild cylinder size */ 1219 /* find the valid cylinder size */
1220 if (private->rdc_data.no_cyl == LV_COMPAT_CYL && 1220 if (private->rdc_data.no_cyl == LV_COMPAT_CYL &&
1221 private->rdc_data.long_no_cyl) 1221 private->rdc_data.long_no_cyl)
1222 private->real_cyl = private->rdc_data.long_no_cyl; 1222 private->real_cyl = private->rdc_data.long_no_cyl;