patch-1.3.11 linux/drivers/block/ide.c

• Lines: 18
• Date: Mon Jul 17 17:00:30 1995
• Orig file: v1.3.10/linux/drivers/block/ide.c
• Orig date: Tue Jul 11 10:02:49 1995

diff -u --recursive --new-file v1.3.10/linux/drivers/block/ide.c linux/drivers/block/ide.c
@@ -1358,7 +1358,7 @@
 		sleep_on(&dev->wqueue);
 	dev->usage++;
 	restore_flags(flags);
-	if (dev->id->config & (1<<7))	/* for removeable disks */
+	if (dev->id && (dev->id->config & (1<<7)))	/* for removeable disks */
 		check_disk_change(inode->i_rdev);
 #ifdef CONFIG_BLK_DEV_IDECD
 	if (dev->type == cdrom)
@@ -1654,7 +1654,7 @@
 	if (dev->type == cdrom)
 		return cdrom_check_media_change (dev);
 #endif	/* CONFIG_BLK_DEV_IDECD */
-	if (dev->id->config & (1<<7))	/* for removeable disks */
+	if (dev->id && (dev->id->config & (1<<7))) /* for removeable disks */
 		return 1;	/* always assume it was changed */
 	return 0;
 }