From 55c63bfc8cb7a016b77f94aba5a35c2c905ed6a2 Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 13 Oct 2008 21:39:49 +0200 Subject: [PATCH] --- yaml --- r: 114219 b: refs/heads/master c: 35d9b17fe2dc48514fa3fbeec910e54103d13333 h: refs/heads/master i: 114217: 842e108a00152aa49659dae4782728c20cfb0f1a 114215: e78b7bb6518328ed0a50f1d4bc49c5ee43386356 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 26a2f9c799c9..ac805e9c8d15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc8323f793852ca1fcb58d96512fd71d39af2e9b +refs/heads/master: 35d9b17fe2dc48514fa3fbeec910e54103d13333 diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index 52e4bbdfd4a8..91a6b462d373 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/drivers/ide/ide-cd.c @@ -2197,8 +2197,11 @@ static struct block_device_operations idecd_ops = { /* module options */ static char *ignore; - module_param(ignore, charp, 0400); + +static unsigned long debug_mask; +module_param(debug_mask, ulong, 0644); + MODULE_DESCRIPTION("ATAPI CD-ROM Driver"); static int ide_cd_probe(ide_drive_t *drive) @@ -2225,6 +2228,9 @@ static int ide_cd_probe(ide_drive_t *drive) goto failed; } } + + drive->debug_mask = debug_mask; + info = kzalloc(sizeof(struct cdrom_info), GFP_KERNEL); if (info == NULL) { printk(KERN_ERR PFX "%s: Can't allocate a cdrom structure\n",