diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
| commit | a422142cfdf90d889d8d3e2affb8311a381530b7 (patch) | |
| tree | bde7e2c7a3ee8bca649aecd877a9ee1593f4223e /drivers/cdrom/gscd.c | |
| parent | 6fc47e31c0e802d205d67e644f654532e5d365d5 (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/cdrom/gscd.c')
| -rw-r--r-- | drivers/cdrom/gscd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c index b6ee50a2916d..fa7082489765 100644 --- a/drivers/cdrom/gscd.c +++ b/drivers/cdrom/gscd.c | |||
| @@ -266,7 +266,7 @@ repeat: | |||
| 266 | goto out; | 266 | goto out; |
| 267 | 267 | ||
| 268 | if (req->cmd != READ) { | 268 | if (req->cmd != READ) { |
| 269 | printk("GSCD: bad cmd %lu\n", rq_data_dir(req)); | 269 | printk("GSCD: bad cmd %u\n", rq_data_dir(req)); |
| 270 | end_request(req, 0); | 270 | end_request(req, 0); |
| 271 | goto repeat; | 271 | goto repeat; |
| 272 | } | 272 | } |