1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index 4a541921a14a..dda14015e873 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/drivers/firewire/fw-cdev.c
@@ -113,6 +113,11 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
         if (device == NULL)
                 return -ENODEV;
 
+        if (fw_device_is_shutdown(device)) {
+                fw_device_put(device);
+                return -ENODEV;
+        }
+
         client = kzalloc(sizeof(*client), GFP_KERNEL);
         if (client == NULL) {
                 fw_device_put(device);
@@ -901,6 +906,9 @@ fw_device_op_ioctl(struct file *file,
 {
         struct client *client = file->private_data;
 
+        if (fw_device_is_shutdown(client->device))
+                return -ENODEV;
+
         return dispatch_ioctl(client, cmd, (void __user *) arg);
 }
 
@@ -911,6 +919,9 @@ fw_device_op_compat_ioctl(struct file *file,
 {
         struct client *client = file->private_data;
 
+        if (fw_device_is_shutdown(client->device))
+                return -ENODEV;
+
         return dispatch_ioctl(client, cmd, compat_ptr(arg));
 }
 #endif
@@ -922,6 +933,9 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
         unsigned long size;
         int page_count, retval;
 
+        if (fw_device_is_shutdown(client->device))
+                return -ENODEV;
+
         /* FIXME: We could support multiple buffers, but we don't. */
         if (client->buffer.pages != NULL)
                 return -EBUSY;